Skip to content

Commit 5e87f85

Browse files
committed
Test on Python 3.11 and make Python 3.10 support official.
1 parent eb15c74 commit 5e87f85

File tree

8 files changed

+36
-17
lines changed

8 files changed

+36
-17
lines changed

.github/workflows/python_ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: "windows-2019"
2222
continue-on-error: ${{ matrix.config.experimental }}
2323
env:
24-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.2,pypy-3.6,pypy-3.7'
24+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-a1,pypy-3.6,pypy-3.7'
2525

2626
strategy:
2727
fail-fast: False
@@ -31,7 +31,8 @@ jobs:
3131
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3232
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3333
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
34-
- {python-version: "3.10.0-rc.2", testenvs: "py310-dev,build", experimental: True}
34+
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
35+
- {python-version: "3.11.0-a1", testenvs: "py311-dev,build", experimental: True}
3536
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
3637
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
3738

.github/workflows/python_ci_linux.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: "ubuntu-20.04"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
25-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.2,pypy-3.6,pypy-3.7'
25+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-a1,pypy-3.6,pypy-3.7'
2626

2727
strategy:
2828
fail-fast: False
@@ -32,7 +32,8 @@ jobs:
3232
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3333
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3434
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
35-
- {python-version: "3.10.0-rc.2", testenvs: "py310-dev,build", experimental: True}
35+
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
36+
- {python-version: "3.11.0-a1", testenvs: "py311-dev,build", experimental: True}
3637
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
3738
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
3839

.github/workflows/python_ci_macos.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: "macos-latest"
2222
continue-on-error: ${{ matrix.config.experimental }}
2323
env:
24-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.2,pypy-3.6,pypy-3.7'
24+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-a1,pypy-3.6,pypy-3.7'
2525

2626
strategy:
2727
fail-fast: False
@@ -31,7 +31,8 @@ jobs:
3131
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3232
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3333
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
34-
- {python-version: "3.10.0-rc.2", testenvs: "py310-dev,build", experimental: True}
34+
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
35+
- {python-version: "3.11.0-a1", testenvs: "py311-dev,build", experimental: True}
3536
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
3637
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
3738

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ base-classifiers = [
126126
"Topic :: Software Development :: Libraries :: Python Modules",
127127
"Typing :: Typed",
128128
]
129-
python-versions = [ "3.6", "3.7", "3.8", "3.9",]
129+
python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10",]
130130
python-implementations = [ "CPython", "PyPy",]
131131
platforms = [ "Windows", "macOS", "Linux",]
132132
license-key = "MIT"

repo_helper.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ conda_channels:
1818
- conda-forge
1919

2020
python_versions:
21-
- 3.6
22-
- 3.7
23-
- 3.8
24-
- 3.9
25-
- 3.10-dev
26-
- pypy36
27-
- pypy37
21+
3.6:
22+
3.7:
23+
3.8:
24+
3.9:
25+
"3.10":
26+
"3.11-dev":
27+
experimental: true
28+
pypy36:
29+
pypy37:
2830

2931
classifiers:
3032
- 'Development Status :: 5 - Production/Stable'

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers =
3232
Programming Language :: Python :: 3.7
3333
Programming Language :: Python :: 3.8
3434
Programming Language :: Python :: 3.9
35+
Programming Language :: Python :: 3.10
3536
Programming Language :: Python :: Implementation :: CPython
3637
Programming Language :: Python :: Implementation :: PyPy
3738
Topic :: Software Development :: Libraries :: Python Modules

tests/test_doctools.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ def test_deindent_string(docstring, expects):
199199
assert doctools.deindent_string(docstring) == expects
200200

201201

202+
@pytest.mark.xfail(PEP_563, reason="The future of PEP 563 is unclear at this time.")
202203
def test_decorators():
203204
# Check the ``SpamCafe`` class has has its docstrings modified appropriately.
204205

tox.ini

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,17 @@
1414
# * pytest
1515

1616
[tox]
17-
envlist = py36, py37, py38, py39, py310-dev, pypy36, pypy37, mypy, build
17+
envlist =
18+
py36
19+
py37
20+
py38
21+
py39
22+
py310
23+
py311-dev
24+
pypy36
25+
pypy37
26+
mypy
27+
build
1828
skip_missing_interpreters = True
1929
isolated_build = True
2030
requires =
@@ -23,7 +33,7 @@ requires =
2333
tox-pip-version>=0.0.7
2434

2535
[envlists]
26-
test = py36, py37, py38, py39, py310-dev, pypy36, pypy37
36+
test = py36, py37, py38, py39, py310, py311-dev, pypy36, pypy37
2737
qa = mypy, lint
2838
cov = py36, coverage
2939

@@ -174,7 +184,9 @@ min_python_version = 3.6
174184
setenv =
175185
PYTHONDEVMODE = 1
176186
PIP_DISABLE_PIP_VERSION_CHECK=1
177-
deps = -r{toxinidir}/tests/requirements.txt
187+
deps =
188+
-r{toxinidir}/tests/requirements.txt
189+
py311: py@git+https://github.com/pytest-dev/py@master
178190
extras = all
179191
ignore_errors = True
180192
commands =

0 commit comments

Comments
 (0)