From cfd1b9013e6bbac410d736131df532bc4a926a2b Mon Sep 17 00:00:00 2001 From: CamDavidsonPilon Date: Fri, 5 Jul 2024 12:47:56 -0400 Subject: [PATCH] the problem was blinka was including numpy in its dependencies, and this was causing a non-compatible numpy to be installed on the pis; this change occurred recently in blinka (a few weeks ago). The issue is _not_ related to numpy 2.0. --- CHANGELOG.md | 2 +- pioreactor/version.py | 2 +- requirements/requirements_worker.txt | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dfede25..5e3e7678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 24.7.5 & 24.7.6 +### 24.7.5 & 24.7.6 & 24.7.7 Hotfix release for 24.7.3. This pins numpy to be less than 2.0 🫤 diff --git a/pioreactor/version.py b/pioreactor/version.py index e55ce972..0c744e03 100644 --- a/pioreactor/version.py +++ b/pioreactor/version.py @@ -7,7 +7,7 @@ # Append ".dev0" if a dev version # Append "rc0" if a rc version # No zero padding! -__version__ = "24.7.6" +__version__ = "24.7.7" def get_hardware_version() -> tuple[int, int] | tuple[int, int, str]: diff --git a/requirements/requirements_worker.txt b/requirements/requirements_worker.txt index 11e5199a..41cce990 100644 --- a/requirements/requirements_worker.txt +++ b/requirements/requirements_worker.txt @@ -1,5 +1,5 @@ -r requirements.txt -numpy==1.24.2 +Adafruit-Blinka==8.43.0 adafruit-circuitpython-ads1x15==2.2.23 DAC43608==0.2.7 TMP1075==0.2.1 diff --git a/setup.py b/setup.py index 6ef41340..39b83ebf 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ WORKER_REQUIREMENTS = [ - "numpy==1.24.2", + "Adafruit-Blinka==8.43.0", "adafruit-circuitpython-ads1x15==2.2.23", "DAC43608==0.2.7", "TMP1075==0.2.1",