floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9417 from nicoddemus/fix-py3.10.1-9413

This commit is contained in:
Bruno Oliveira 2021-12-16 10:37:52 -03:00 committed by GitHub
parent 3bbadda0cf 913439f5e5
commit 47df71d23f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@ -78,7 +78,7 @@ jobs:
os: windows-latest os: windows-latest
tox_env: "py39-xdist" tox_env: "py39-xdist"
- name: "windows-py310" - name: "windows-py310"
python: "3.10-dev" python: "3.10.1"
os: windows-latest os: windows-latest
tox_env: "py310-xdist" tox_env: "py310-xdist"
@ -108,7 +108,7 @@ jobs:
os: ubuntu-latest os: ubuntu-latest
tox_env: "py39-xdist" tox_env: "py39-xdist"
- name: "ubuntu-py310" - name: "ubuntu-py310"
python: "3.10-dev" python: "3.10.1"
os: ubuntu-latest os: ubuntu-latest
tox_env: "py310-xdist" tox_env: "py310-xdist"
- name: "ubuntu-pypy3" - name: "ubuntu-pypy3"

2
testing/test_skipping.py
View File

@ -1143,8 +1143,6 @@ def test_errors_in_xfail_skip_expressions(pytester: Pytester) -> None:
pypy_version_info = getattr(sys, "pypy_version_info", None) pypy_version_info = getattr(sys, "pypy_version_info", None)
if pypy_version_info is not None and pypy_version_info < (6,): if pypy_version_info is not None and pypy_version_info < (6,):
markline = markline[5:] markline = markline[5:]
elif sys.version_info[:2] >= (3, 10):
markline = markline[11:]
elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"): elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"):
markline = markline[4:] markline = markline[4:]