From 35d6bb26697614c6dabb13528c5d475cfa3f6304 Mon Sep 17 00:00:00 2001 From: HanslettTheDev Date: Wed, 23 Aug 2023 15:32:30 +0100 Subject: [PATCH 1/2] feat: removed the environment markers and left just one pillow version Signed-off-by: HanslettTheDev --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7e3c56cc7..1203bcc60 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,10 +4,9 @@ pysimplesoap==1.08.14; python_version <= '2.7' git+https://github.com/pysimplesoap/pysimplesoap.git@py311#pysimplesoap; python_version > '3' cryptography==3.3.2; python_version <= '2.7' cryptography==41.0.1; python_version > '3' +Pillow>=2.0.0 fpdf>=1.7.2 dbf>=0.88.019 -Pillow<=9.5.0; platform_machine!='x86_64' -Pillow>=2.0.0; platform_machine=='x86_64' tabulate==0.8.5 certifi>=2020.4.5.1 qrcode==6.1 From ea6512113a3ffbf331fb6fcf333175415e99315e Mon Sep 17 00:00:00 2001 From: HanslettTheDev Date: Wed, 23 Aug 2023 15:33:58 +0100 Subject: [PATCH 2/2] feat: workaround fix using a python one liner to replace Pillow versions on the fly Signed-off-by: HanslettTheDev --- .github/workflows/windows-installer.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/windows-installer.yml b/.github/workflows/windows-installer.yml index dffb9fc7a..eb6b50384 100644 --- a/.github/workflows/windows-installer.yml +++ b/.github/workflows/windows-installer.yml @@ -29,6 +29,10 @@ jobs: python -m pip install --upgrade pip python -m pip install --upgrade setuptools wheel python -m pip install --upgrade cachetools pefile + - name: Change requirements.txt on 32bit python + if: matrix.targetplatform == 'x86' + run: | + python -c "with open('requirements.txt', 'r') as file: content = file.read(); content = content.replace('Pillow>=2.0.0', 'Pillow<=9.5.0'); f = open('requirements.txt', 'w'); f.write(content)" - name: Install production dependencies run: | pip install -r requirements.txt