Updated test & build matrix to include Python 3.12 and use GitHub Act…

…ions as a Trusted Publisher
simplejson · Oct 5, 2023 · cf1367b · cf1367b
1 parent aeb63ee
commit cf1367b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -27,12 +27,12 @@ jobs:
 
       - name: Set up QEMU
         if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.11.4
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           CIBW_TEST_COMMAND: >-
             python -m simplejson.tests._cibw_runner "{project}"
@@ -65,7 +65,7 @@ jobs:
       - uses: actions/setup-python@v2
         name: Install Python
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Install dependencies
         run: python -m pip install --upgrade pip setuptools wheel
@@ -94,6 +94,11 @@ jobs:
   upload_pypi:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
+    environment:
+      name: release
+      url: https://pypi.org/p/simplejson/
+    permissions:
+      id-token: write
     # upload to PyPI on every tag starting with 'v'
     if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')"
     # alternatively, to publish when a GitHub Release is created, use the following rule:
@@ -104,16 +109,17 @@ jobs:
           name: artifact
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@v1.4.2
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_PASSWORD }}
-          # To test: repository_url: https://test.pypi.org/legacy/
+      - uses: pypa/gh-action-pypi-publish@v1.8.10
 
   upload_pypi_test:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
-    # upload to PyPI on every tag starting with 'v'
+    environment:
+      name: "testpypi"
+      url: https://test.pypi.org/p/simplejson/
+    permissions:
+      id-token: write
+    # upload to test PyPI on every tag starting with 'test-v'
     if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/test-v')"
     # alternatively, to publish when a GitHub Release is created, use the following rule:
     # if: github.event_name == 'release' && github.event.action == 'published'
@@ -123,8 +129,6 @@ jobs:
           name: artifact
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@v1.4.2
+      - uses: pypa/gh-action-pypi-publish@v1.8.10
         with:
-          user: __token__
-          password: ${{ secrets.PYPI_PASSWORD_TEST }}
-          repository_url: https://test.pypi.org/legacy/
+          repository-url: https://test.pypi.org/legacy/
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,8 @@
+Version 3.19.2 released 2023-10-05
+
+* Updated test & build matrix to include Python 3.12 and use
+  GitHub Actions as a Trusted Publisher (OIDC)
+
 Version 3.19.1 released 2023-04-06
 
 * This release contains security hardening measures based on recommendations

diff --git a/setup.py b/setup.py
@@ -40,6 +40,7 @@
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: Implementation :: CPython',
     'Programming Language :: Python :: Implementation :: PyPy',
     'Topic :: Software Development :: Libraries :: Python Modules',