From 85157305a5c14f97282bd46740663e0e3264bdcb Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Fri, 10 Jan 2025 12:31:25 +0100 Subject: [PATCH 1/4] 92: Run CI workflow under all python versions from 3.9-3.13 and fix dependency pinning to major version instead of also pinning minor version for dependencies. --- .github/workflows/ci.yml | 30 +++++++++++++++++++++++++----- pyproject.toml | 12 ++++++------ 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 268e684..0384b69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.9", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] name: Setup steps: - uses: actions/checkout@v3 @@ -35,9 +35,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.9", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] steps: - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Restore venv uses: actions/download-artifact@v4 with: @@ -55,9 +60,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.9", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] steps: - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Restore venv uses: actions/download-artifact@v4 with: @@ -98,9 +108,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.9", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] steps: - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Restore venv uses: actions/download-artifact@v4 with: @@ -121,9 +136,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.9", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] steps: - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Restore venv uses: actions/download-artifact@v4 with: diff --git a/pyproject.toml b/pyproject.toml index 4124e98..547cf26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,13 +24,13 @@ classifiers = [ ] dependencies = [ - "aio-pika ~= 9.4.2", - "omotes-sdk-protocol ~= 0.1.13", + "aio-pika ~= 9.4", + "omotes-sdk-protocol ~= 0.1", "pyesdl ~= 24.2", - "pamqp ~= 3.3.0", - "celery ~= 5.3.6", - "typing-extensions ~= 4.11.0", - "streamcapture ~= 1.2.4", + "pamqp ~= 3.3", + "celery ~= 5.3", + "typing-extensions ~= 4.11", + "streamcapture ~= 1.2.5", ] [project.optional-dependencies] From 76426cc455a56199620dd1f44396e1a78da782fa Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Fri, 10 Jan 2025 12:35:21 +0100 Subject: [PATCH 2/4] 92: Make ci pipelines for linux and windows consistent. --- .github/workflows/{ci.yml => ci_linux.yml} | 0 .../workflows/{BuildTest_win32.yml => ci_win32.yml} | 13 ++++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) rename .github/workflows/{ci.yml => ci_linux.yml} (100%) rename .github/workflows/{BuildTest_win32.yml => ci_win32.yml} (75%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci_linux.yml similarity index 100% rename from .github/workflows/ci.yml rename to .github/workflows/ci_linux.yml diff --git a/.github/workflows/BuildTest_win32.yml b/.github/workflows/ci_win32.yml similarity index 75% rename from .github/workflows/BuildTest_win32.yml rename to .github/workflows/ci_win32.yml index 413c40b..ec633bd 100644 --- a/.github/workflows/BuildTest_win32.yml +++ b/.github/workflows/ci_win32.yml @@ -9,8 +9,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.9", "3.11"] -# python-version: [3.9, 3.10, 3.11, 3.12] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} @@ -22,10 +21,14 @@ jobs: .\ci\win32\create_venv.cmd .\ci\win32\install_dependencies.cmd - - name: run unit tests + - name: Run lint + run: | + .\ci\win32\lint.cmd + + - name: Run unit tests run: | .\ci\win32\test_unit.cmd - - name: Lint + - name: Run typecheck run: | - .\ci\win32\lint.cmd + .\ci\win32\typecheck.cmd From faeaca38b3605b6ee531d74c27c0416c86d52b67 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Fri, 10 Jan 2025 12:36:09 +0100 Subject: [PATCH 3/4] 92: Remove flake8-quotes due to incompatibilities with python 3.13. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 547cf26..379c987 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,6 @@ dev = [ "flake8 == 7.1.1", "flake8-pyproject ~= 1.2.3", "flake8-docstrings ~= 1.7.0", - "flake8-quotes ~= 3.4.0", "flake8-bugbear ~= 24.10.31", "flake8-mock ~= 0.4", "flake8-tuple ~= 0.4.1", From 2b84108bf16b69dc18e0fa3e7b5f30be5a4aadb9 Mon Sep 17 00:00:00 2001 From: Sebastiaan la Fleur Date: Fri, 10 Jan 2025 12:43:19 +0100 Subject: [PATCH 4/4] 92: flake8-mock is causing issues under python 3.13, not flake8-quotes. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 379c987..3cbd301 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,8 +42,8 @@ dev = [ "flake8 == 7.1.1", "flake8-pyproject ~= 1.2.3", "flake8-docstrings ~= 1.7.0", + "flake8-quotes ~= 3.4.0", "flake8-bugbear ~= 24.10.31", - "flake8-mock ~= 0.4", "flake8-tuple ~= 0.4.1", "pytest ~= 8.3.4", "pytest-cov ~= 6.0.0",