From eab46367be2c1476a28f3af663104e75cd258023 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Sat, 7 Oct 2023 23:50:14 +0200 Subject: [PATCH 1/5] fix unavailable repo for pi-rc522. Use fix version to ensure compatibility --- .../components/rfid/hardware/rc522_spi/requirements.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/jukebox/components/rfid/hardware/rc522_spi/requirements.txt b/src/jukebox/components/rfid/hardware/rc522_spi/requirements.txt index fce2291e4..78a3b459a 100644 --- a/src/jukebox/components/rfid/hardware/rc522_spi/requirements.txt +++ b/src/jukebox/components/rfid/hardware/rc522_spi/requirements.txt @@ -1,13 +1,6 @@ # RC522 related requirements # You need to install these with `sudo python3 -m pip install --upgrade --force-reinstall -q -r requirements.txt` -# pi-rc522 use latest version from Github -# This is the original versions. Seems unmaintained for the moment -# git+https://github.com/ondryaso/pi-rc522.git#egg=pi-rc522 - -# The fork of kevinvalk has some good improvements -# https://github.com/kevinvalk/pi-rc522 -# Get the kevinvalk fork yet again from a different fork which ensures compatibility with the Phoniebox -git+https://github.com/ChisSoc/pi-rc522.git#egg=pi-rc522 +pi-rc522==2.3.0 From 606a31785a279203415411595d42fbbc27471b23 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Sun, 8 Oct 2023 01:44:13 +0200 Subject: [PATCH 2/5] build trigger --- conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conftest.py b/conftest.py index b8ff16f06..f5dcefc42 100644 --- a/conftest.py +++ b/conftest.py @@ -1,3 +1,4 @@ import sys import os sys.path.append(os.path.abspath('src/jukebox')) + From 923db309330425cef5bb969d01846bdf4a190633 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Sun, 8 Oct 2023 01:48:29 +0200 Subject: [PATCH 3/5] REVERT build trigger --- conftest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conftest.py b/conftest.py index f5dcefc42..b8ff16f06 100644 --- a/conftest.py +++ b/conftest.py @@ -1,4 +1,3 @@ import sys import os sys.path.append(os.path.abspath('src/jukebox')) - From d1a2959f652a7f7ca013c3afc062190351d06d94 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Sun, 8 Oct 2023 02:21:31 +0200 Subject: [PATCH 4/5] fixed sphinx gpiozero version for pyton < 3.8 --- docs/sphinx/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt index f6b511362..8bf6f447c 100644 --- a/docs/sphinx/requirements.txt +++ b/docs/sphinx/requirements.txt @@ -4,4 +4,4 @@ readthedocs-sphinx-search # Install packages for documentation build from package repository # that are installed on the PI via APT RPi.GPIO -gpiozero +gpiozero<2.0.0;python_version<'3.8' From 299641bcf3fc84ac42b84ab43ec55575242ac8b6 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Sun, 8 Oct 2023 02:29:43 +0200 Subject: [PATCH 5/5] fixed sphinx gpiozero version for pyton >= 3.8 --- docs/sphinx/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt index 8bf6f447c..e169c2c69 100644 --- a/docs/sphinx/requirements.txt +++ b/docs/sphinx/requirements.txt @@ -5,3 +5,4 @@ readthedocs-sphinx-search # that are installed on the PI via APT RPi.GPIO gpiozero<2.0.0;python_version<'3.8' +gpiozero;python_version>='3.8'