Skip to content

Commit ec947fe

Browse files
committed
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.
1 parent fbb34ea commit ec947fe

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

.github/workflows/tox.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ jobs:
2020
fail-fast: false
2121
max-parallel: 4
2222
matrix:
23-
tox-env: [py37, py38, py39, py310, py311, pypy37, pypy38, pypy39, pygments]
23+
tox-env: [py38, py39, py310, py311, py212, pypy38, pypy39, pypy310, pygments]
2424
include:
25-
- tox-env: py37
26-
python-version: '3.7'
2725
- tox-env: py38
2826
python-version: '3.8'
2927
- tox-env: py39
@@ -32,14 +30,16 @@ jobs:
3230
python-version: '3.10'
3331
- tox-env: py311
3432
python-version: '3.11'
35-
- tox-env: pypy37
36-
python-version: pypy-3.7
33+
- tox-env: py312
34+
python-version: '3.12'
3735
- tox-env: pypy38
3836
python-version: pypy-3.8
3937
- tox-env: pypy39
4038
python-version: pypy-3.9
39+
- tox-env: pypy310
40+
python-version: pypy-3.10
4141
- tox-env: pygments
42-
python-version: '3.7'
42+
python-version: '3.11'
4343

4444
env:
4545
TOXENV: ${{ matrix.tox-env }}
@@ -81,7 +81,7 @@ jobs:
8181
- name: Setup Python
8282
uses: actions/setup-python@v2
8383
with:
84-
python-version: 3.7
84+
python-version: 3.11
8585
- name: Install dependencies
8686
run: |
8787
python -m pip install --upgrade pip tox

pyproject.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ maintainers = [
1818
{name = 'Isaac Muse'}
1919
]
2020
license = {file = 'LICENSE.md'}
21-
requires-python = '>=3.7'
21+
requires-python = '>=3.8'
2222
dependencies = [
2323
"importlib-metadata>=4.4;python_version<'3.10'"
2424
]
@@ -29,11 +29,11 @@ classifiers = [
2929
'Operating System :: OS Independent',
3030
'Programming Language :: Python',
3131
'Programming Language :: Python :: 3',
32-
'Programming Language :: Python :: 3.7',
3332
'Programming Language :: Python :: 3.8',
3433
'Programming Language :: Python :: 3.9',
3534
'Programming Language :: Python :: 3.10',
3635
'Programming Language :: Python :: 3.11',
36+
'Programming Language :: Python :: 3.12',
3737
'Programming Language :: Python :: 3 :: Only',
3838
'Programming Language :: Python :: Implementation :: CPython',
3939
'Programming Language :: Python :: Implementation :: PyPy',
@@ -51,6 +51,7 @@ classifiers = [
5151
testing = [
5252
'coverage',
5353
'pyyaml',
54+
'packaging'
5455
]
5556
docs = [
5657
'mkdocs>=1.0',

tests/test_meta.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ def test_get_version(self):
1616
def test__version__IsValid(self):
1717
"""Test that __version__ is valid and normalized."""
1818

19-
try:
20-
import packaging.version
21-
except ImportError:
22-
from pkg_resources.extern import packaging
19+
import packaging.version
2320

2421
self.assertEqual(__version__, str(packaging.version.Version(__version__)))

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{37, 38, 39, 310, 311}, pypy{37, 38, 39}, pygments, flake8, checkspelling, pep517check, checklinks
2+
envlist = py{38, 39, 310, 311, 312}, pypy{38, 39, 310}, pygments, flake8, checkspelling, pep517check, checklinks
33
isolated_build = True
44

55
[testenv]

0 commit comments

Comments
 (0)