Skip to content

Commit f015932

Browse files
authored
Merge pull request #500 from hugovk/add-3.10
Add support for Python 3.10
2 parents 679935b + 60a3cc1 commit f015932

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.github/workflows/test.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
python-version: ["pypy-3.6", "pypy-3.7", "3.6", "3.7", "3.8", "3.9"]
14+
python-version: ["pypy-3.6", "pypy-3.7", "3.6", "3.7", "3.8", "3.9", "3.10-dev"]
1515
tox-extra-versions: [
1616
"pytest46-xdist127",
1717
"pytest46-xdist133",
@@ -26,12 +26,16 @@ jobs:
2626
- {python-version: "3.7", tox-python-version: "py37"}
2727
- {python-version: "3.8", tox-python-version: "py38"}
2828
- {python-version: "3.9", tox-python-version: "py39"}
29+
- {python-version: "3.10-dev", tox-python-version: "py310"}
2930
exclude:
3031
# Remove some jobs from the matrix
3132
- {tox-extra-versions: "pytest46-xdist127", python-version: "3.8"}
3233
- {tox-extra-versions: "pytest46-xdist127", python-version: "3.9"}
3334
- {tox-extra-versions: "pytest46-xdist133", python-version: "3.9"}
3435
- {tox-extra-versions: "pytest54-xdist133", python-version: "3.9"}
36+
- {tox-extra-versions: "pytest46-xdist127", python-version: "3.10-dev"}
37+
- {tox-extra-versions: "pytest46-xdist133", python-version: "3.10-dev"}
38+
- {tox-extra-versions: "pytest54-xdist133", python-version: "3.10-dev"}
3539

3640
steps:
3741
- uses: actions/checkout@v2

setup.cfg

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[bdist_wheel]
2-
universal = 1
3-
41
[flake8]
52
max-line-length = 140
63
exclude = .tox,.eggs,ci/templates,build,dist

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ def run(self):
109109
'Programming Language :: Python :: 3.7',
110110
'Programming Language :: Python :: 3.8',
111111
'Programming Language :: Python :: 3.9',
112+
'Programming Language :: Python :: 3.10',
112113
'Programming Language :: Python :: Implementation :: CPython',
113114
'Programming Language :: Python :: Implementation :: PyPy',
114115
'Topic :: Software Development :: Testing',

tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ envlist =
1515
check
1616
py{36,37,py,py3}-pytest46-xdist127-coverage{55}
1717
py{36,37,38,py3}-pytest{46,54}-xdist133-coverage{55}
18-
py{36,37,38,39,py3}-pytest{62}-xdist202-coverage{55}
18+
py{36,37,38,39,310,py3}-pytest{62}-xdist202-coverage{55}
1919
docs
2020

2121
[testenv]
@@ -29,7 +29,7 @@ setenv =
2929
pytest54: _DEP_PYTEST=pytest==5.4.3
3030
pytest60: _DEP_PYTEST=pytest==6.0.2
3131
pytest61: _DEP_PYTEST=pytest==6.1.2
32-
pytest62: _DEP_PYTEST=pytest==6.2.2
32+
pytest62: _DEP_PYTEST=pytest==6.2.5
3333

3434
xdist127: _DEP_PYTESTXDIST=pytest-xdist==1.27.0
3535
xdist129: _DEP_PYTESTXDIST=pytest-xdist==1.29.0

0 commit comments

Comments
 (0)