Merge pull request #8494 from nicoddemus/python-3.10
This commit is contained in:
commit
c1bdff9e69
|
@ -27,6 +27,8 @@ jobs:
|
||||||
"windows-py37",
|
"windows-py37",
|
||||||
"windows-py37-pluggy",
|
"windows-py37-pluggy",
|
||||||
"windows-py38",
|
"windows-py38",
|
||||||
|
"windows-py39",
|
||||||
|
"windows-py310",
|
||||||
|
|
||||||
"ubuntu-py36",
|
"ubuntu-py36",
|
||||||
"ubuntu-py37",
|
"ubuntu-py37",
|
||||||
|
@ -34,6 +36,7 @@ jobs:
|
||||||
"ubuntu-py37-freeze",
|
"ubuntu-py37-freeze",
|
||||||
"ubuntu-py38",
|
"ubuntu-py38",
|
||||||
"ubuntu-py39",
|
"ubuntu-py39",
|
||||||
|
"ubuntu-py310",
|
||||||
"ubuntu-pypy3",
|
"ubuntu-pypy3",
|
||||||
|
|
||||||
"macos-py37",
|
"macos-py37",
|
||||||
|
@ -62,6 +65,14 @@ jobs:
|
||||||
os: windows-latest
|
os: windows-latest
|
||||||
tox_env: "py38-unittestextras"
|
tox_env: "py38-unittestextras"
|
||||||
use_coverage: true
|
use_coverage: true
|
||||||
|
- name: "windows-py39"
|
||||||
|
python: "3.9"
|
||||||
|
os: windows-latest
|
||||||
|
tox_env: "py39-xdist"
|
||||||
|
- name: "windows-py310"
|
||||||
|
python: "3.10-dev"
|
||||||
|
os: windows-latest
|
||||||
|
tox_env: "py310-xdist"
|
||||||
|
|
||||||
- name: "ubuntu-py36"
|
- name: "ubuntu-py36"
|
||||||
python: "3.6"
|
python: "3.6"
|
||||||
|
@ -88,6 +99,10 @@ jobs:
|
||||||
python: "3.9"
|
python: "3.9"
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
tox_env: "py39-xdist"
|
tox_env: "py39-xdist"
|
||||||
|
- name: "ubuntu-py310"
|
||||||
|
python: "3.10-dev"
|
||||||
|
os: ubuntu-latest
|
||||||
|
tox_env: "py310-xdist"
|
||||||
- name: "ubuntu-pypy3"
|
- name: "ubuntu-pypy3"
|
||||||
python: "pypy-3.7"
|
python: "pypy-3.7"
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
|
|
|
@ -42,6 +42,7 @@ repos:
|
||||||
rev: v1.17.0
|
rev: v1.17.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: setup-cfg-fmt
|
- id: setup-cfg-fmt
|
||||||
|
args: [--max-py-version=3.10]
|
||||||
- repo: https://github.com/pre-commit/pygrep-hooks
|
- repo: https://github.com/pre-commit/pygrep-hooks
|
||||||
rev: v1.8.0
|
rev: v1.8.0
|
||||||
hooks:
|
hooks:
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Python 3.10 is now supported.
|
|
@ -26,6 +26,8 @@ filterwarnings = [
|
||||||
# produced by older pyparsing<=2.2.0.
|
# produced by older pyparsing<=2.2.0.
|
||||||
"default:Using or importing the ABCs:DeprecationWarning:pyparsing.*",
|
"default:Using or importing the ABCs:DeprecationWarning:pyparsing.*",
|
||||||
"default:the imp module is deprecated in favour of importlib:DeprecationWarning:nose.*",
|
"default:the imp module is deprecated in favour of importlib:DeprecationWarning:nose.*",
|
||||||
|
# distutils is deprecated in 3.10, scheduled for removal in 3.12
|
||||||
|
"ignore:The distutils package is deprecated:DeprecationWarning",
|
||||||
# produced by python3.6/site.py itself (3.6.7 on Travis, could not trigger it with 3.6.8)."
|
# produced by python3.6/site.py itself (3.6.7 on Travis, could not trigger it with 3.6.8)."
|
||||||
"ignore:.*U.*mode is deprecated:DeprecationWarning:(?!(pytest|_pytest))",
|
"ignore:.*U.*mode is deprecated:DeprecationWarning:(?!(pytest|_pytest))",
|
||||||
# produced by pytest-xdist
|
# produced by pytest-xdist
|
||||||
|
|
|
@ -21,6 +21,7 @@ classifiers =
|
||||||
Programming Language :: Python :: 3.7
|
Programming Language :: Python :: 3.7
|
||||||
Programming Language :: Python :: 3.8
|
Programming Language :: Python :: 3.8
|
||||||
Programming Language :: Python :: 3.9
|
Programming Language :: Python :: 3.9
|
||||||
|
Programming Language :: Python :: 3.10
|
||||||
Topic :: Software Development :: Libraries
|
Topic :: Software Development :: Libraries
|
||||||
Topic :: Software Development :: Testing
|
Topic :: Software Development :: Testing
|
||||||
Topic :: Utilities
|
Topic :: Utilities
|
||||||
|
|
|
@ -876,7 +876,8 @@ class TestSkip:
|
||||||
result = pytester.runpytest()
|
result = pytester.runpytest()
|
||||||
result.stdout.fnmatch_lines(
|
result.stdout.fnmatch_lines(
|
||||||
[
|
[
|
||||||
"*TypeError: __init__() got multiple values for argument 'reason' - maybe you meant pytest.mark.skipif?"
|
"*TypeError: *__init__() got multiple values for argument 'reason'"
|
||||||
|
" - maybe you meant pytest.mark.skipif?"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue