From 18ce5d6c4b5fab987593b4304a470ea436c94d58 Mon Sep 17 00:00:00 2001 From: CamDavidsonPilon Date: Tue, 3 Oct 2023 11:10:08 -0400 Subject: [PATCH] reorgnaize requirements --- .github/workflows/build.yaml | 2 +- requirements/requirements.txt | 2 ++ requirements/requirements_dev.txt | 4 +--- requirements/requirements_leader.txt | 1 + requirements/requirements_leader_worker.txt | 2 ++ requirements/requirements_worker.txt | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 requirements/requirements_leader_worker.txt diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9273c72bf..9ee902c30 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -53,7 +53,7 @@ jobs: python -m pip install wheel build --user - name: 🔨 Build wheels for all dependencies run: | - pip download -d wheels -r requirements/requirements_dev.txt --index-url https://piwheels.org/simple --platform linux_armv7l --platform linux_armv6l --platform manylinux_2_31_armv7l --only-binary=:all: --extra-index-url https://pypi.org/simple --python-version 39 + pip download -d wheels -r requirements/requirements_leader_worker.txt --index-url https://piwheels.org/simple --platform linux_armv7l --platform linux_armv6l --platform manylinux_2_31_armv7l --only-binary=:all: --extra-index-url https://pypi.org/simple --python-version 39 - name: Zip the wheels run: | cd wheels diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 25b36718f..c946dbb49 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -7,3 +7,5 @@ rpi_hardware_pwm==0.1.3 colorlog==6.7.0 msgspec==0.18.2 diskcache==5.6.1 +wheel==0.38.4 +crudini==0.9.4 diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt index 50d60aeec..cad0f2819 100644 --- a/requirements/requirements_dev.txt +++ b/requirements/requirements_dev.txt @@ -1,6 +1,4 @@ --r requirements.txt --r requirements_worker.txt --r requirements_leader.txt +-r requirements_leader_worker.txt pytest pytest-timeout pytest-random-order diff --git a/requirements/requirements_leader.txt b/requirements/requirements_leader.txt index 30ef9b7a3..96454676c 100644 --- a/requirements/requirements_leader.txt +++ b/requirements/requirements_leader.txt @@ -1 +1,2 @@ +-r requirements.txt zeroconf==0.64.1 diff --git a/requirements/requirements_leader_worker.txt b/requirements/requirements_leader_worker.txt new file mode 100644 index 000000000..d85944cae --- /dev/null +++ b/requirements/requirements_leader_worker.txt @@ -0,0 +1,2 @@ +-r requirements_leader.txt +-r requirements_worker.txt diff --git a/requirements/requirements_worker.txt b/requirements/requirements_worker.txt index 727526857..6ee73555c 100644 --- a/requirements/requirements_worker.txt +++ b/requirements/requirements_worker.txt @@ -1,3 +1,4 @@ +-r requirements.txt RPi.GPIO==0.7.1; platform_machine == "armv7l" adafruit-circuitpython-ads1x15==2.2.12 DAC43608==0.2.6