Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub Actions: python: ["3.8", "3.9", "3.10", "3.11", "3.12"] #575

Merged
merged 12 commits into from
Jan 10, 2024
30 changes: 18 additions & 12 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
image: Visual Studio 2019
# appveyor.yml - https://www.appveyor.com/docs/lang/python
# https://www.appveyor.com/docs/windows-images-software/#visual-studio-2022
---
image: Visual Studio 2022
environment:
global:
PATH: "C:\\Python27\\Scripts\\;%PATH%"
matrix:
- TOXENV: py27-base
- TOXENV: py27-optional
- TOXENV: py35-base
- TOXENV: py35-optional
- TOXENV: py36-base
- TOXENV: py36-optional
- PY_PYTHON: 2.7
TOXENV: py27-base
- PY_PYTHON: 2.7
TOXENV: py27-optional
- PY_PYTHON: 3.7
TOXENV: py37-base
- PY_PYTHON: 3.7
TOXENV: py37-optional

install:
- git submodule update --init --recursive
- python -m pip install tox
- py --list
- py -VV
- py -m pip install --upgrade pip
- py -m pip install tox

build: off

test_script:
- tox
- py -m tox

after_test:
- python debug-info.py
- py debug-info.py
19 changes: 8 additions & 11 deletions .github/workflows/python-tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,35 @@ jobs:
strategy:
fail-fast: false
matrix:
# 2.7, 3.5, and 3.6 run on Windows via AppVeyor
python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
# 2.7 and 3.7 run on Windows via AppVeyor
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
os: [ubuntu-latest, windows-latest]
deps: [base, optional]
include:
- python: "pypy-2.7"
os: ubuntu-latest
deps: base
- python: "pypy-3.8"
- python: "pypy-3.10"
os: ubuntu-latest
deps: base
- python: "2.7"
os: ubuntu-latest
deps: oldest
- python: "3.7"
- python: "3.8"
os: ubuntu-latest
deps: oldest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- if: ${{ matrix.deps == 'base' }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
cache: pip
cache-dependency-path: |
requirements.txt
requirements-test.txt
- if: ${{ matrix.deps == 'optional' }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
cache: pip
Expand All @@ -47,7 +44,7 @@ jobs:
requirements-optional.txt
requirements-test.txt
- if: ${{ matrix.deps == 'oldest' }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
cache: pip
Expand Down
4 changes: 3 additions & 1 deletion html5lib/tests/tokenizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,9 @@ def runtest(self):
def repr_failure(self, excinfo):
traceback = excinfo.traceback
ntraceback = traceback.cut(path=__file__)
excinfo.traceback = ntraceback.filter()
pytest_ver = getattr(pytest, "version_tuple", ())
filter_args = (excinfo,) if pytest_ver >= (7, 4, 0) else ()
excinfo.traceback = ntraceback.filter(*filter_args)

return excinfo.getrepr(funcargs=True,
showlocals=False,
Expand Down
4 changes: 3 additions & 1 deletion html5lib/tests/tree_construction.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ def runtest(self):
def repr_failure(self, excinfo):
traceback = excinfo.traceback
ntraceback = traceback.cut(path=__file__)
excinfo.traceback = ntraceback.filter()
pytest_ver = getattr(pytest, "version_tuple", ())
filter_args = (excinfo,) if pytest_ver >= (7, 4, 0) else ()
excinfo.traceback = ntraceback.filter(*filter_args)

return excinfo.getrepr(funcargs=True,
showlocals=False,
Expand Down
3 changes: 2 additions & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
flake8==3.9.2 ; python_version < '3.6'
flake8>=5.0.4; python_version >= '3.6'
pytest>=4.6.10,<5 ; python_version < '3'
pytest>=5.4.2,<7 ; python_version >= '3'
pytest>=5.4.2,<8 ; python_version >= '3'
coverage>=5.1,<6
pytest-expect>=1.1.0,<2
mock>=3.0.5,<4 ; python_version < '3.6'
mock>=4.0.2,<5 ; python_version >= '3.6'
setuptools; python_version >= '3.12'