Merge branch 'adafruit:main' into main

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea5eab574717f0571002f74b20631e2d7eb86ea3..80940d0f12cfb7e33f6361f5734d25ead33f1585 100644 (file)
--- 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 c0d141e9c1ee0397646d7f8c651e5e7ad6741860..5a85cc75268885143ede3423a19633c665b6e34d 100644 (file)
--- 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 641a2021fa448b6f2b2f7f6a954f816750025f46..cc9835a7be44aa9650856ab6458c4bc5ceb19197 100644 (file)
--- 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