Add support for Python 3.12 (#11)

pyasn1 · Sep 22, 2023 · 252ac00 · 252ac00
1 parent ffc91a9
commit 252ac00
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,12 +22,13 @@ on:
 permissions:
   contents: read
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   tests:
     name: "Python ${{ matrix.python-version }}"
-    # 20.04 because https://github.com/actions/python-versions
-    # does not have 2.7 and 3.6 binaries for 22.04.
-    runs-on: "ubuntu-20.04"
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
@@ -38,18 +39,24 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
-          - "3.11-dev"
+          - "3.11"
           - "pypy-2.7"
           - "pypy-3.7"
           - "pypy-3.8"
           - "pypy-3.9"
+        # 20.04 because https://github.com/actions/python-versions
+        # does not have 2.7 and 3.6 binaries for 22.04.
+        os: ["ubuntu-20.04"]
+        include:
+          - { python-version: "3.12", os: "ubuntu-latest" }
     steps:
       - uses: "actions/checkout@v3"
         with:
           ref: ${{ inputs.tag || github.ref }}
       - uses: "actions/setup-python@v4"
         with:
           python-version: "${{ matrix.python-version }}"
+          allow-prereleases: true
           cache: "pip"
       - name: "Update pip"
         run: python -m pip install --upgrade pip setuptools wheel
@@ -68,7 +75,7 @@ jobs:
           ref: ${{ inputs.tag || github.ref }}
       - uses: "actions/setup-python@v4"
         with:
-          python-version: "3.10"
+          python-version: "3.x"
           cache: "pip"
       - name: "Update pip"
         run: python -m pip install --upgrade pip setuptools wheel
@@ -77,14 +84,14 @@ jobs:
       - name: "Run 'build'"
         run: "python -m build"
       - name: "Upload sdist artifact"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: sdist
           path: |
             dist/pyasn1*.tar.gz
           if-no-files-found: error
       - name: "Upload wheel artifact"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheel
           path: |

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.x"
       - name: "Update pip"
         run: python -m pip install --upgrade pip setuptools wheel
       - name: "Install 'build' and 'twine'"

diff --git a/setup.cfg b/setup.cfg
@@ -36,6 +36,7 @@ classifiers =
     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 :: Communications

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.5.0
 envlist =
-    py27, py36, py37, py38, py39, py310, py311, pypy27, pypy37, pypy38, pypy39
+    py27, py36, py37, py38, py39, py310, py311, py312, pypy27, pypy37, pypy38, pypy39
     cover, bandit, build
 isolated_build = true
 skip_missing_interpreters = true
@@ -46,6 +46,7 @@ python =
     3.9: py39
     3.10: py310, cover, build, bandit
     3.11: py311
+    3.12: py312
     pypy-2.7: pypy27
     pypy-3.7: pypy37
     pypy-3.8: pypy38