From 53bc912535972e97c9c7e4b122529246740b248c Mon Sep 17 00:00:00 2001 From: Michael Rapp Date: Sun, 5 May 2024 18:53:57 +0200 Subject: [PATCH 1/4] [Bot] Reset version of bugfix branch to 0.9.1. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 71172b43ae..f514a2f0bd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.1 \ No newline at end of file +0.9.1 \ No newline at end of file From 71d7e1065fb677f9428d50f07e3f43b7e2235cfb Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 May 2024 16:55:34 +0000 Subject: [PATCH 2/4] [Bot] Update version to 0.10.1. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2774f8587f..71172b43ae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.0 \ No newline at end of file +0.10.1 \ No newline at end of file From f318511623a258da621de404d7ff7565bf8e56c8 Mon Sep 17 00:00:00 2001 From: Michael Rapp Date: Sun, 5 May 2024 19:18:11 +0200 Subject: [PATCH 3/4] Apply Github Action "setup-python" before installing twine. --- .github/workflows/template_publish_non_native.yml | 9 +++++---- .github/workflows/template_publish_platform.yml | 9 +++++---- .github/workflows/template_publish_pure.yml | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/template_publish_non_native.yml b/.github/workflows/template_publish_non_native.yml index ac506828ed..8842c996a9 100644 --- a/.github/workflows/template_publish_non_native.yml +++ b/.github/workflows/template_publish_non_native.yml @@ -45,6 +45,9 @@ jobs: CIBW_SKIP: 'pp* *musllinux*' with: package-dir: python/subprojects/${{ inputs.subproject }}/ + - name: Setup Python + if: ${{ inputs.pypi_repository }} + uses: actions/setup-python@v5 - name: Upload wheels to PyPI if: ${{ inputs.pypi_repository }} env: @@ -52,10 +55,8 @@ jobs: TWINE_PASSWORD: ${{ secrets.pypi_password }} TWINE_REPOSITORY: ${{ inputs.pypi_repository }} run: | - source venv/bin/activate - python3 -m pip install twine - python3 -m twine upload --non-interactive --skip-existing wheelhouse/* - deactivate + python -m pip install twine + python -m twine upload --non-interactive --skip-existing wheelhouse/* - name: Upload wheels as artifacts if: ${{ inputs.pypi_repository }} uses: actions/upload-artifact@v4 diff --git a/.github/workflows/template_publish_platform.yml b/.github/workflows/template_publish_platform.yml index aba661e76c..7425b46bb0 100644 --- a/.github/workflows/template_publish_platform.yml +++ b/.github/workflows/template_publish_platform.yml @@ -48,6 +48,9 @@ jobs: CIBW_SKIP: 'pp* *musllinux*' with: package-dir: python/subprojects/${{ inputs.subproject }}/ + - name: Setup Python + if: ${{ inputs.pypi_repository }} + uses: actions/setup-python@v5 - name: Upload wheels to PyPI if: ${{ inputs.pypi_repository }} env: @@ -55,10 +58,8 @@ jobs: TWINE_PASSWORD: ${{ secrets.pypi_password }} TWINE_REPOSITORY: ${{ inputs.pypi_repository }} run: | - source venv/bin/activate - python3 -m pip install twine - python3 -m twine upload --non-interactive --skip-existing wheelhouse/* - deactivate + python -m pip install twine + python -m twine upload --non-interactive --skip-existing wheelhouse/* - name: Upload wheels as artifacts if: ${{ inputs.pypi_repository }} uses: actions/upload-artifact@v4 diff --git a/.github/workflows/template_publish_pure.yml b/.github/workflows/template_publish_pure.yml index 57dd7045da..4578cf6141 100644 --- a/.github/workflows/template_publish_pure.yml +++ b/.github/workflows/template_publish_pure.yml @@ -33,6 +33,9 @@ jobs: SUBPROJECTS=${{ inputs.subproject }} ./build build_wheels mkdir wheelhouse cp python/subprojects/**/dist/*.whl wheelhouse/ + - name: Setup Python + if: ${{ inputs.pypi_repository }} + uses: actions/setup-python@v5 - name: Upload wheels to PyPI if: ${{ inputs.pypi_repository }} env: @@ -40,10 +43,8 @@ jobs: TWINE_PASSWORD: ${{ secrets.pypi_password }} TWINE_REPOSITORY: ${{ inputs.pypi_repository }} run: | - source venv/bin/activate - python3 -m pip install twine - python3 -m twine upload --non-interactive --skip-existing wheelhouse/* - deactivate + python -m pip install twine + python -m twine upload --non-interactive --skip-existing wheelhouse/* - name: Upload wheels as artifacts if: ${{ inputs.pypi_repository }} uses: actions/upload-artifact@v4 From afc38f49c2b6a3ad195960779649b25f617b37b0 Mon Sep 17 00:00:00 2001 From: michael-rapp <6638695+michael-rapp@users.noreply.github.com> Date: Sun, 5 May 2024 17:21:11 +0000 Subject: [PATCH 4/4] [Bot] Merge bugfix into feature branch. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 71172b43ae..142464bf22 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.1 \ No newline at end of file +0.11.0 \ No newline at end of file