From 487f24294e74692ba412c752582b80bb7294cb9a Mon Sep 17 00:00:00 2001 From: Rebecca Breu Date: Wed, 13 Dec 2023 21:58:02 +0100 Subject: [PATCH] Upgrade dependencies; allow older libraries that worked in setup.py --- .github/workflows/pytest.yml | 2 ++ requirements/build.txt | 2 +- setup.py | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 6cf3051..c3f4ef7 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -9,6 +9,7 @@ jobs: strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11'] + pyqt-version: ['6.4.0', '6.6.0'] steps: - uses: actions/checkout@v4 - name: Set up Python @@ -23,6 +24,7 @@ jobs: python -m pip install --upgrade pip pip install . pip install -r requirements/test.txt + pip install pyQt6==${{ matrix.pyqt-version }} pyQt6-Qt6==${{ matrix.pyqt-version }} --upgrade - name: Run Unittests with pytest run: | xvfb-run --auto-servernum --server-num=1 --server-args="-screen 1 1920x1200x24 -ac +extension GLX" pytest --cov --cov-report=xml diff --git a/requirements/build.txt b/requirements/build.txt index d24b778..c88444d 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,3 +1,3 @@ # For the test action on github -pyinstaller==6.2.0 +pyinstaller==6.3.0 diff --git a/setup.py b/setup.py index f745c78..46b7cfd 100644 --- a/setup.py +++ b/setup.py @@ -9,10 +9,10 @@ setup( license='LICENSE', description='A simple reference image viewer', install_requires=[ - 'pyQt6==6.6.0', - 'pyQt6-Qt6==6.6.0', - 'rectangle-packer==2.0.2', - 'exif==1.6.0', + 'pyQt6>=6.4.0,<=6.6.1', + 'pyQt6-Qt6>=6.4.0,<=6.6.1', + 'rectangle-packer>=2.0.1,<=2.0.2', + 'exif>=1.3.5,<=1.6.0', ], packages=[ 'beeref',