Merge branch 'main' into rm-3.7

.github/workflows/deploy.yml

@@ -35,10 +35,6 @@ jobs:
           cache: pip
           cache-dependency-path: ".github/workflows/deploy.yml"
 
-      - name: Install dependencies
-        run: |
-          python -m pip install -U twine
-
       # https://github.com/pypa/cibuildwheel
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.13.0
@@ -50,6 +46,8 @@ jobs:
           CIBW_ARCHS_MACOS: "x86_64 arm64"
           # Build only on Linux architectures that don't need qemu emulation.
           CIBW_ARCHS_LINUX: "x86_64 i686"
+          # Include latest Python beta.
+          CIBW_PRERELEASE_PYTHONS: True
           # Run the test suite after each build.
           CIBW_TEST_REQUIRES: "pytest"
           CIBW_TEST_COMMAND: pytest {package}/tests
@@ -62,20 +60,22 @@ jobs:
 
       - name: Publish package to PyPI
         if: github.event.action == 'published'
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.pypi_password }}
-        run: twine upload --skip-existing dist/*.whl
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}
+          skip-existing: true
 
       - name: Publish package to TestPyPI
         if: |
           github.repository == 'ultrajson/ultrajson' &&
           github.ref == 'refs/heads/main'
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.test_pypi_password }}
-        run: |
-          twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.test_pypi_password }}
+          repository-url: https://test.pypi.org/legacy/
+          skip-existing: true
 
   build-QEMU-emulated-wheels:
     runs-on: ubuntu-latest
@@ -89,6 +89,7 @@ jobs:
           - cp39
           - cp310
           - cp311
+          - cp312
 
     steps:
       - uses: actions/checkout@v3
@@ -101,10 +102,6 @@ jobs:
           cache: pip
           cache-dependency-path: ".github/workflows/deploy.yml"
 
-      - name: Install dependencies
-        run: |
-          python -m pip install -U twine
-
       # https://github.com/docker/setup-qemu-action
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -125,6 +122,8 @@ jobs:
           CIBW_ARCHS_LINUX: "aarch64"
           # Likewise, select only one Python version per job to speed this up.
           CIBW_BUILD: "${{ matrix.python-version }}-*"
+          # Include latest Python beta.
+          CIBW_PRERELEASE_PYTHONS: True
           # Run the test suite after each build.
           CIBW_TEST_REQUIRES: "pytest"
           CIBW_TEST_COMMAND: pytest {package}/tests
@@ -137,20 +136,22 @@ jobs:
 
       - name: Publish package to PyPI
         if: github.event.action == 'published'
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.pypi_password }}
-        run: twine upload --skip-existing dist/*.whl
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}
+          skip-existing: true
 
       - name: Publish package to TestPyPI
         if: |
           github.repository == 'ultrajson/ultrajson' &&
           github.ref == 'refs/heads/main'
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.test_pypi_password }}
-        run: |
-          twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.test_pypi_password }}
+          repository-url: https://test.pypi.org/legacy/
+          skip-existing: true
 
   build-sdist:
     runs-on: ubuntu-latest
@@ -171,7 +172,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U pip
-          python -m pip install -U build twine wheel
+          python -m pip install -U build twine
 
       - name: Build package
         run: |

.pre-commit-config.yaml

@@ -43,7 +43,6 @@ repos:
     rev: v2.3.0
     hooks:
       - id: setup-cfg-fmt
-        args: [--include-version-classifiers]
-
+        args: [--include-version-classifiers, --max-py-version=3.12]
 ci:
   autoupdate_schedule: quarterly

setup.cfg

@@ -18,6 +18,7 @@ classifiers =
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
 download_url = https://github.com/ultrajson/ultrajson
 project_urls =
     Source=https://github.com/ultrajson/ultrajson