From 2b037bda3ddbcfea41f2f4d218a1b05dfa044697 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Thu, 20 Jun 2024 11:08:53 -0700 Subject: [PATCH 1/2] Move sysv_ipc check from platform to cpu --- setup.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index ba81428e..0effb9af 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,6 @@ import io import os -import platform from setuptools import setup, find_packages @@ -36,18 +35,17 @@ or b"brcm,bcm2838" in compat or b"brcm,bcm2711" in compat ): - board_reqs = ["RPi.GPIO", "rpi_ws281x>=4.0.0"] + board_reqs = ["RPi.GPIO", "rpi_ws281x>=4.0.0", "sysv_ipc>=1.1.0"] # Pi 5 if b"brcm,bcm2712" in compat: - board_reqs = ["rpi_ws281x>=4.0.0", "rpi-lgpio"] + board_reqs = ["rpi_ws281x>=4.0.0", "rpi-lgpio", "sysv_ipc>=1.1.0"] + if b"amlogic,a311d" in compat: + board_reqs = ["sysv_ipc>=1.1.0"] if ( b"ti,am335x" in compat ): # BeagleBone Black, Green, PocketBeagle, BeagleBone AI, etc. board_reqs = ["Adafruit_BBIO"] -if platform.system() == "Linux" and platform.machine() != "mips": - platform_reqs = ["sysv_ipc>=1.1.0"] - setup( name="Adafruit-Blinka", use_scm_version={ @@ -101,8 +99,7 @@ "numpy>=1.21.5", "adafruit-circuitpython-typing", ] - + board_reqs - + platform_reqs, + + board_reqs, license="MIT", classifiers=[ # Trove classifiers From 715836ce99ac45a5e95b6005c2e445337e59e5ae Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Thu, 20 Jun 2024 11:09:56 -0700 Subject: [PATCH 2/2] Remove unused variable --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 0effb9af..1889573c 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ long_description = "\n" + f.read() board_reqs = [] -platform_reqs = [] if os.path.exists("/proc/device-tree/compatible"): with open("/proc/device-tree/compatible", "rb") as f: compat = f.read()