diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 2231932..b58657f 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -3,16 +3,16 @@ name: flake8 on: [push, pull_request] jobs: - build: + flake8: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 7fe7291..c1e4135 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -3,13 +3,12 @@ name: pytest on: [push, pull_request] jobs: - build: - + pytest: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.9', '3.11'] - pyqt-version: ['6.5.0', '6.6.1'] + python-version: ["3.9", "3.10", "3.11", "3.12"] + pyqt-version: ["6.5.3", "6.7.0"] steps: - uses: actions/checkout@v4 - name: Set up Python @@ -38,4 +37,4 @@ jobs: with: verbose: true fail_ci_if_error: true - token: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/images/python_version_badge.svg b/images/python_version_badge.svg index 9907506..a772f42 100644 --- a/images/python_version_badge.svg +++ b/images/python_version_badge.svg @@ -1 +1 @@ -PythonPython3.9 | 3.10 | 3.113.9 | 3.10 | 3.11 \ No newline at end of file +PythonPython3.9 | 3.10 | 3.11 | 3.123.9 | 3.10 | 3.11 | 3.12 diff --git a/pyproject.toml b/pyproject.toml index fff525c..f153c3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,12 +11,12 @@ license = {file = "LICENSE"} authors = [ { name = "Rebecca Breu", email = "rebecca@rbreu.de" }, ] -requires-python = ">=3.9" +requires-python = ">=3.9,<3.13" dependencies = [ "exif>=1.3.5,<=1.6.0", "lxml==5.1.0", - "pyQt6-Qt6>=6.5.0,<=6.6.1", - "pyQt6>=6.5.0,<=6.6.1", + "pyQt6-Qt6>=6.5.3,<=6.7.0", + "pyQt6>=6.5.0,<=6.7.0", "rectangle-packer>=2.0.1,<=2.0.2", ] diff --git a/requirements/build.txt b/requirements/build.txt index c88444d..1efda05 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,3 +1,3 @@ -# For the test action on github +# For the build action on github -pyinstaller==6.3.0 +pyinstaller==6.6.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index 3a83d3b..db195c8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -3,6 +3,6 @@ -r test.txt -r build.txt -flake8==6.1.0 +flake8==7.0.0 pybadges==3.0.1 -yamllint==1.33.0 +yamllint==1.35.1 diff --git a/requirements/test.txt b/requirements/test.txt index 6664786..ae20409 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,6 +1,6 @@ # For the test action on github -coverage==7.3.2 +coverage==7.5.1 httpretty==1.1.4 -pytest==7.4.3 -pytest-qt==4.2.0 -pytest-cov==4.1.0 +pytest==8.2.0 +pytest-qt==4.4.0 +pytest-cov==5.0.0 diff --git a/tests/test_scene.py b/tests/test_scene.py index 28583d1..7df249b 100644 --- a/tests/test_scene.py +++ b/tests/test_scene.py @@ -887,7 +887,7 @@ def test_mouse_move_event_when_rubberband_new( view.scene.rubberband_item.rect().bottomRight().x() == 10 view.scene.rubberband_item.rect().bottomRight().y() == 20 assert item.isSelected() is True - assert mouse_mock.called_once_with(event) + mouse_mock.assert_called_once_with(event) @patch('PyQt6.QtWidgets.QGraphicsScene.mouseMoveEvent') @@ -911,7 +911,7 @@ def test_mouse_move_event_when_rubberband_not_new( view.scene.rubberband_item.rect().bottomRight().x() == 10 view.scene.rubberband_item.rect().bottomRight().y() == 20 assert item.isSelected() is True - assert mouse_mock.called_once_with(event) + mouse_mock.assert_called_once_with(event) @patch('PyQt6.QtWidgets.QGraphicsScene.mouseMoveEvent') @@ -933,7 +933,7 @@ def test_mouse_move_event_when_no_rubberband(mouse_mock, view, imgfilename3x3): view.scene.rubberband_item.rect().bottomRight().x() == 0 view.scene.rubberband_item.rect().bottomRight().y() == 0 assert item.isSelected() is False - assert mouse_mock.called_once_with(event) + mouse_mock.assert_called_once_with(event) @patch('PyQt6.QtWidgets.QGraphicsScene.mouseReleaseEvent')