Merge pull request #898 from mrapp-ke/merge-bugfix

Merge bugfix into feature branch
mrapp-ke · May 5, 2024 · fddee6e · fddee6e
2 parents 62cc300 + afc38f4
commit fddee6e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/template_publish_non_native.yml b/.github/workflows/template_publish_non_native.yml
@@ -45,17 +45,18 @@ 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:
           TWINE_USERNAME: ${{ secrets.pypi_username }}
           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
@@ -48,17 +48,18 @@ 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:
           TWINE_USERNAME: ${{ secrets.pypi_username }}
           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
@@ -33,17 +33,18 @@ 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:
           TWINE_USERNAME: ${{ secrets.pypi_username }}
           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