From d892be76ea2b94f5ed300a0d17032fa38c0106b5 Mon Sep 17 00:00:00 2001 From: Claas Date: Sun, 14 Jul 2024 21:09:51 +0200 Subject: [PATCH 1/9] GitHub workflows: Replaced pip install tox with pip install tox-uv --- .github/workflows/_test.yml | 2 +- .github/workflows/_test_future.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 504c4a77..ff03fb10 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -30,6 +30,6 @@ jobs: python-version: ${{ matrix.python.version }} cache: 'pip' # cache pip dependencies - name: Install tox - run: python -m pip install tox + run: python -m pip install tox-uv - name: Run pytest run: tox -e ${{matrix.python.toxenv}}-${{matrix.platform.toxenv}} diff --git a/.github/workflows/_test_future.yml b/.github/workflows/_test_future.yml index aed952a0..e75a3a04 100644 --- a/.github/workflows/_test_future.yml +++ b/.github/workflows/_test_future.yml @@ -26,6 +26,6 @@ jobs: python-version: ${{ matrix.python.version }} cache: 'pip' # cache pip dependencies - name: Install tox - run: python -m pip install tox + run: python -m pip install tox-uv - name: Run pytest run: tox -e ${{matrix.python.toxenv}}-${{matrix.platform.toxenv}} From 3be0c01a5205f80dab4440cf1178386468d033b9 Mon Sep 17 00:00:00 2001 From: Claas Date: Sun, 14 Jul 2024 21:09:51 +0200 Subject: [PATCH 2/9] GitHub workflows: Removed cache: 'pip' for tox-uv compatibility --- .github/workflows/_build_and_publish_documentation.yml | 1 - .github/workflows/_build_package.yml | 1 - .github/workflows/_code_quality.yml | 3 --- .github/workflows/_test.yml | 1 - .github/workflows/_test_future.yml | 1 - 5 files changed, 7 deletions(-) diff --git a/.github/workflows/_build_and_publish_documentation.yml b/.github/workflows/_build_and_publish_documentation.yml index 54f80e2a..e95ef0f3 100644 --- a/.github/workflows/_build_and_publish_documentation.yml +++ b/.github/workflows/_build_and_publish_documentation.yml @@ -21,7 +21,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.11' - cache: 'pip' # cache pip dependencies - name: Install dependencies run: | pip install -r requirements-dev.txt diff --git a/.github/workflows/_build_package.yml b/.github/workflows/_build_package.yml index 96f0deea..8ba4f439 100644 --- a/.github/workflows/_build_package.yml +++ b/.github/workflows/_build_package.yml @@ -14,7 +14,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' - cache: 'pip' # cache pip dependencies - name: Install build and twine run: pip install build twine - name: Run build diff --git a/.github/workflows/_code_quality.yml b/.github/workflows/_code_quality.yml index 9a509308..ef0bddb8 100644 --- a/.github/workflows/_code_quality.yml +++ b/.github/workflows/_code_quality.yml @@ -11,7 +11,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' - cache: 'pip' # cache pip dependencies - name: Install dependencies run: pip install -r requirements.txt - name: Install ruff @@ -27,7 +26,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' - cache: 'pip' # cache pip dependencies - name: Install dependencies run: pip install -r requirements.txt - name: Install ruff @@ -43,7 +41,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' - cache: 'pip' # cache pip dependencies - name: Install dependencies run: | pip install -r requirements.txt diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index ff03fb10..bbf6accb 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -28,7 +28,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python.version }} - cache: 'pip' # cache pip dependencies - name: Install tox run: python -m pip install tox-uv - name: Run pytest diff --git a/.github/workflows/_test_future.yml b/.github/workflows/_test_future.yml index e75a3a04..5a57c2a2 100644 --- a/.github/workflows/_test_future.yml +++ b/.github/workflows/_test_future.yml @@ -24,7 +24,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python.version }} - cache: 'pip' # cache pip dependencies - name: Install tox run: python -m pip install tox-uv - name: Run pytest From 4bb781e01c7b344b8871c3992e97f38ba8522c7d Mon Sep 17 00:00:00 2001 From: Claas Date: Sun, 14 Jul 2024 21:09:52 +0200 Subject: [PATCH 3/9] GitHub workflows: Install dependencies: change singleline run statements to multiline run statements --- .github/workflows/_build_package.yml | 3 ++- .github/workflows/_code_quality.yml | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_build_package.yml b/.github/workflows/_build_package.yml index 8ba4f439..d54346c3 100644 --- a/.github/workflows/_build_package.yml +++ b/.github/workflows/_build_package.yml @@ -15,7 +15,8 @@ jobs: with: python-version: '3.11' - name: Install build and twine - run: pip install build twine + run: | + pip install build twine - name: Run build run: python -m build - name: Run twine check diff --git a/.github/workflows/_code_quality.yml b/.github/workflows/_code_quality.yml index ef0bddb8..36da24b2 100644 --- a/.github/workflows/_code_quality.yml +++ b/.github/workflows/_code_quality.yml @@ -12,9 +12,11 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: pip install -r requirements.txt + run: | + pip install -r requirements.txt - name: Install ruff - run: pip install ruff==0.5.1 + run: | + pip install ruff==0.5.1 - name: Run ruff format run: ruff format --diff . @@ -27,9 +29,11 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: pip install -r requirements.txt + run: | + pip install -r requirements.txt - name: Install ruff - run: pip install ruff==0.5.1 + run: | + pip install ruff==0.5.1 - name: Run ruff check run: ruff check --diff . @@ -46,6 +50,7 @@ jobs: pip install -r requirements.txt pip install pytest - name: Install pyright - run: pip install pyright==1.1.371 + run: | + pip install pyright==1.1.371 - name: Run pyright run: pyright . From d8869f79c1d8bc78db94ceb8e3785b7e8e998368 Mon Sep 17 00:00:00 2001 From: Claas Date: Sun, 14 Jul 2024 21:09:52 +0200 Subject: [PATCH 4/9] GitHub workflows: Add step to install 'uv' package --- .../_build_and_publish_documentation.yml | 3 +++ .github/workflows/_code_quality.yml | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_build_and_publish_documentation.yml b/.github/workflows/_build_and_publish_documentation.yml index e95ef0f3..2d2a615e 100644 --- a/.github/workflows/_build_and_publish_documentation.yml +++ b/.github/workflows/_build_and_publish_documentation.yml @@ -21,6 +21,9 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.11' + - name: Install uv + run: | + python -m pip install uv - name: Install dependencies run: | pip install -r requirements-dev.txt diff --git a/.github/workflows/_code_quality.yml b/.github/workflows/_code_quality.yml index 36da24b2..8ecd7b22 100644 --- a/.github/workflows/_code_quality.yml +++ b/.github/workflows/_code_quality.yml @@ -11,7 +11,10 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' - - name: Install dependencies + - name: Install uv + run: | + python -m pip install uv + - name: Install dependencies run: | pip install -r requirements.txt - name: Install ruff @@ -28,7 +31,10 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' - - name: Install dependencies + - name: Install uv + run: | + python -m pip install uv + - name: Install dependencies run: | pip install -r requirements.txt - name: Install ruff @@ -45,7 +51,10 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' - - name: Install dependencies + - name: Install uv + run: | + python -m pip install uv + - name: Install dependencies run: | pip install -r requirements.txt pip install pytest From af88f9a5a07f08d5dd45227ba9f7ba1b79bf1715 Mon Sep 17 00:00:00 2001 From: Claas Date: Sun, 14 Jul 2024 21:09:52 +0200 Subject: [PATCH 5/9] GitHub workflows: Add step to install 'uv' package --- .github/workflows/_build_package.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_build_package.yml b/.github/workflows/_build_package.yml index d54346c3..6ea4c07a 100644 --- a/.github/workflows/_build_package.yml +++ b/.github/workflows/_build_package.yml @@ -14,7 +14,10 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' - - name: Install build and twine + - name: Install uv + run: | + python -m pip install uv + - name: Install build and twine run: | pip install build twine - name: Run build From 6e3fe21bdcd19c9a49228c236e89fd7313cc8c0b Mon Sep 17 00:00:00 2001 From: Claas Date: Sun, 14 Jul 2024 21:09:53 +0200 Subject: [PATCH 6/9] GitHub workflows: Install dependencies: change from 'pip install' to 'uv pip install' --- .../workflows/_build_and_publish_documentation.yml | 2 +- .github/workflows/_build_package.yml | 2 +- .github/workflows/_code_quality.yml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/_build_and_publish_documentation.yml b/.github/workflows/_build_and_publish_documentation.yml index 2d2a615e..487f638a 100644 --- a/.github/workflows/_build_and_publish_documentation.yml +++ b/.github/workflows/_build_and_publish_documentation.yml @@ -26,7 +26,7 @@ jobs: python -m pip install uv - name: Install dependencies run: | - pip install -r requirements-dev.txt + uv pip install --system -r requirements-dev.txt - name: Print debugging information run: | echo "github.ref:" ${{github.ref}} diff --git a/.github/workflows/_build_package.yml b/.github/workflows/_build_package.yml index 6ea4c07a..85ba25df 100644 --- a/.github/workflows/_build_package.yml +++ b/.github/workflows/_build_package.yml @@ -19,7 +19,7 @@ jobs: python -m pip install uv - name: Install build and twine run: | - pip install build twine + uv pip install --system build twine - name: Run build run: python -m build - name: Run twine check diff --git a/.github/workflows/_code_quality.yml b/.github/workflows/_code_quality.yml index 8ecd7b22..a5dd412f 100644 --- a/.github/workflows/_code_quality.yml +++ b/.github/workflows/_code_quality.yml @@ -16,10 +16,10 @@ jobs: python -m pip install uv - name: Install dependencies run: | - pip install -r requirements.txt + uv pip install --system -r requirements.txt - name: Install ruff run: | - pip install ruff==0.5.1 + uv pip install --system ruff==0.5.1 - name: Run ruff format run: ruff format --diff . @@ -36,10 +36,10 @@ jobs: python -m pip install uv - name: Install dependencies run: | - pip install -r requirements.txt + uv pip install --system -r requirements.txt - name: Install ruff run: | - pip install ruff==0.5.1 + uv pip install --system ruff==0.5.1 - name: Run ruff check run: ruff check --diff . @@ -56,10 +56,10 @@ jobs: python -m pip install uv - name: Install dependencies run: | - pip install -r requirements.txt - pip install pytest + uv pip install --system -r requirements.txt + uv pip install --system pytest - name: Install pyright run: | - pip install pyright==1.1.371 + uv pip install --system pyright==1.1.371 - name: Run pyright run: pyright . From b2ab8f96a1e4232fe6616d61270c95d0fa932e81 Mon Sep 17 00:00:00 2001 From: Claas Date: Sun, 14 Jul 2024 21:09:53 +0200 Subject: [PATCH 7/9] GitHub workflow _test_future.yml : updated Python version to 3.13.0-alpha - 3.13.0 --- .github/workflows/_test_future.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_test_future.yml b/.github/workflows/_test_future.yml index 5a57c2a2..223056ba 100644 --- a/.github/workflows/_test_future.yml +++ b/.github/workflows/_test_future.yml @@ -16,7 +16,7 @@ jobs: - runner: windows-latest toxenv: windows python: - - version: '3.13.0a2' + - version: '3.13.0-alpha - 3.13.0' toxenv: 'py313' steps: - uses: actions/checkout@v4 From a781654a0194dbc318b843a199e6caa0c17924ea Mon Sep 17 00:00:00 2001 From: Claas Date: Sun, 14 Jul 2024 21:09:53 +0200 Subject: [PATCH 8/9] GitHub workflow _test_future.yml : updated name of test job to 'test313' --- .github/workflows/_test_future.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_test_future.yml b/.github/workflows/_test_future.yml index 223056ba..28ede257 100644 --- a/.github/workflows/_test_future.yml +++ b/.github/workflows/_test_future.yml @@ -4,7 +4,7 @@ name: Unit Tests (py312) on: workflow_call jobs: - test312: + test313: name: Test on ${{matrix.python.toxenv}}-${{matrix.platform.toxenv}} (experimental) continue-on-error: true runs-on: ${{ matrix.platform.runner }} From 4ec1a25879aec34f383f159e5d20229a4a7fa6a0 Mon Sep 17 00:00:00 2001 From: Claas Date: Sun, 14 Jul 2024 21:09:53 +0200 Subject: [PATCH 9/9] updated CHANGELOG.md --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ab3bc4f..757ad779 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e ## [Unreleased] +### Dependencies +* GitHub workflows: Replaced pip install tox with pip install tox-uv +* GitHub workflows: Removed cache: 'pip' for tox-uv compatibility +* GitHub workflows: Install dependencies: change singleline run statements to multiline run statements +* GitHub workflows: Add step to install 'uv' package +* GitHub workflows: Add step to install 'uv' package +* GitHub workflows: Install dependencies: change from 'pip install' to 'uv pip install' +* GitHub workflow _test_future.yml : updated Python version to 3.13.0-alpha - 3.13.0 +* GitHub workflow _test_future.yml : updated name of test job to 'test313' + ### Dependencies * updated to black[jupyter]==24.4 (from black[jupyter]==23.12) * updated to version: '==24.4' (from version: '==23.12')