Add PY3.12 & PYPY3.10 and drop 3.7

Also update default version for non-version specific tests (linters, etc) to PY-3.11 (previously used 3.7). Fixes Python-Markdown#1357.
waylan · Aug 7, 2023 · d8f5060 · d8f5060
1 parent fbb34ea
commit d8f5060
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -20,10 +20,8 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        tox-env: [py37, py38, py39, py310, py311, pypy37, pypy38, pypy39, pygments]
+        tox-env: [py38, py39, py310, py311, py212, pypy38, pypy39, pypy310, pygments]
         include:
-          - tox-env: py37
-            python-version: '3.7'
           - tox-env: py38
             python-version: '3.8'
           - tox-env: py39
@@ -32,14 +30,16 @@ jobs:
             python-version: '3.10'
           - tox-env: py311
             python-version: '3.11'
-          - tox-env: pypy37
-            python-version: pypy-3.7
+            - tox-env: py312
+            python-version: '3.12'
           - tox-env: pypy38
             python-version: pypy-3.8
           - tox-env: pypy39
             python-version: pypy-3.9
+            - tox-env: pypy310
+            python-version: pypy-3.10
           - tox-env: pygments
-            python-version: '3.7'
+            python-version: '3.11'
 
     env:
       TOXENV: ${{ matrix.tox-env }}
@@ -81,7 +81,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.11
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip tox

diff --git a/pyproject.toml b/pyproject.toml
@@ -18,7 +18,7 @@ maintainers = [
     {name = 'Isaac Muse'}
 ]
 license = {file = 'LICENSE.md'}
-requires-python = '>=3.7'
+requires-python = '>=3.8'
 dependencies = [
     "importlib-metadata>=4.4;python_version<'3.10'"
 ]
@@ -29,11 +29,11 @@ classifiers = [
     'Operating System :: OS Independent',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3 :: Only',
     'Programming Language :: Python :: Implementation :: CPython',
     'Programming Language :: Python :: Implementation :: PyPy',
@@ -51,6 +51,7 @@ classifiers = [
 testing = [
     'coverage',
     'pyyaml',
+    'packaging'
 ]
 docs = [
     'mkdocs>=1.0',

diff --git a/tests/test_meta.py b/tests/test_meta.py
@@ -16,9 +16,6 @@ def test_get_version(self):
     def test__version__IsValid(self):
         """Test that __version__ is valid and normalized."""
 
-        try:
-            import packaging.version
-        except ImportError:
-            from pkg_resources.extern import packaging
+        import packaging.version
 
         self.assertEqual(__version__, str(packaging.version.Version(__version__)))
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{37, 38, 39, 310, 311}, pypy{37, 38, 39}, pygments, flake8, checkspelling, pep517check, checklinks
+envlist = py{38, 39, 310, 311, 312}, pypy{38, 39, 310}, pygments, flake8, checkspelling, pep517check, checklinks
 isolated_build = True
 
 [testenv]