From: UnicodeMan <lveitas956@gmail.com>
Date: Mon, 20 Jan 2025 13:59:15 +0000 (+0200)
Subject: Merge branch 'adafruit:main' into main
X-Git-Tag: 8.57.0~5^2~1^2~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/aaa4312df31620d70940ab01adaa17eb787d20a9?hp=3fd540b41ea696b32633ff708e970155ce9fec15

Merge branch 'adafruit:main' into main
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea5eab5..80940d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,10 +16,10 @@ jobs:
     - name: Translate Repo Name For Build Tools filename_prefix
       id: repo-name
       run: echo "repo-name=Adafruit-Blinka" >> $GITHUB_OUTPUT
-    - name: Set up Python 3.7
+    - name: Set up Python 3.8
       uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.8
     - name: Versions
       run: |
         python3 --version
diff --git a/src/board.py b/src/board.py
index c0d141e..5a85cc7 100644
--- a/src/board.py
+++ b/src/board.py
@@ -41,13 +41,7 @@ elif board_id == ap_board.PYBOARD:
 elif board_id == ap_board.RASPBERRY_PI_PICO:
     from adafruit_blinka.board.raspberrypi.pico import *
 
-elif (
-    detector.board.RASPBERRY_PI_4B
-    or detector.board.RASPBERRY_PI_CM4
-    or detector.board.RASPBERRY_PI_CM4S
-    or detector.board.RASPBERRY_PI_400
-    or detector.board.RASPBERRY_PI_5
-):
+elif detector.board.any_raspberry_pi_4_board or detector.board.any_raspberry_pi_5_board:
     from adafruit_blinka.board.raspberrypi.raspi_4b import *
 
 elif detector.board.any_raspberry_pi_40_pin:
diff --git a/src/neopixel_write.py b/src/neopixel_write.py
index 641a202..cc9835a 100644
--- a/src/neopixel_write.py
+++ b/src/neopixel_write.py
@@ -13,10 +13,10 @@ Currently supported on Raspberry Pi only.
 # pylint: disable=too-many-boolean-expressions, ungrouped-imports
 import sys
 
-from adafruit_blinka.agnostic import detector, board_id
+from adafruit_blinka.agnostic import detector
 
 if detector.board.any_raspberry_pi:
-    if board_id == "RASPBERRY_PI_5":
+    if detector.board.any_raspberry_pi_5_board:
         import adafruit_raspberry_pi5_neopixel_write as _neopixel
     else:
         from adafruit_blinka.microcontroller.bcm283x import neopixel as _neopixel