Merge branch 'main' into develop

Author: NilsWinter

.github/workflows/python-deploy_to_pypi.yml

@@ -8,6 +8,9 @@ jobs:
   deploy:
     name: Build and publish to PyPI
     runs-on: ubuntu-22.04
+    environment: pypi
+    permissions:
+      id-token: write
     steps:
     - uses: actions/checkout@v4
       with:
@@ -22,6 +25,3 @@ jobs:
       run: python -m build -n --sdist --wheel --outdir dist/ .
     - name: Publish distribution to Test PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/python-test_and_deploy.yml

@@ -44,6 +44,9 @@ jobs:
   deploy:
     name: Build and publish to TestPyPI
     runs-on: ubuntu-22.04
+    environment: pypi
+    permissions:
+      id-token: write
     if: github.ref == 'refs/heads/main'
     steps:
     - uses: actions/checkout@v4
@@ -60,6 +63,4 @@ jobs:
     - name: Publish distribution to Test PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        user: __token__
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
         repository_url: https://test.pypi.org/legacy/