Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf0bb2a6

Browse files
authored
Test more on GitHub Actions (#564)
The only environments left on AppVeyor are now 2.7, 3.5, and 3.6. The remaining Python versions are now also tested on Windows using GitHub Actions.Additionally, a new group of dependencies called "oldest" is now tested as well to ensure compatibility with the oldest pinned versions in requirements.txt and setup.py.AppVeyor is used for 3.5 and 3.6 because those versions aren't available on GitHub Actions at all. Python 2.7 crashes on Windows with a pip cache failure so it only runs on GHA with the "oldest" dependencies on Ubuntu.The other Python version running "oldest" dependencies is 3.7, also only running on Ubuntu.
1 parent01b7dea commitf0bb2a6

9 files changed

+147
-42
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ environment:
99
-TOXENV:py35-optional
1010
-TOXENV:py36-base
1111
-TOXENV:py36-optional
12-
-TOXENV:py37-base
13-
-TOXENV:py37-optional
14-
-TOXENV:py38-base
15-
-TOXENV:py38-optional
16-
-TOXENV:py39-base
17-
-TOXENV:py39-optional
18-
-TOXENV:py310-base
19-
-TOXENV:py310-optional
2012

2113
install:
2214
-git submodule update --init --recursive

‎.github/workflows/python-tox.yml

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,62 @@ jobs:
44
# Prevent duplicate builds for 'internal' pull requests on existing commits
55
# Credit: https://github.community/t/duplicate-checks-on-push-and-pull-request-simultaneous-event/18012
66
if:github.event.push || github.event.pull_request.head.repo.full_name != github.repository
7-
runs-on:ubuntu-latest
87
strategy:
98
fail-fast:false
109
matrix:
11-
python:["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy-2.7", "pypy-3.8"]
10+
# 2.7, 3.5, and 3.6 run on Windows via AppVeyor
11+
python:["3.7", "3.8", "3.9", "3.10", "3.11"]
12+
os:[ubuntu-latest, windows-latest]
13+
deps:[base, optional]
14+
include:
15+
-python:"pypy-2.7"
16+
os:ubuntu-latest
17+
deps:base
18+
-python:"pypy-3.8"
19+
os:ubuntu-latest
20+
deps:base
21+
-python:"2.7"
22+
os:ubuntu-latest
23+
deps:oldest
24+
-python:"3.7"
25+
os:ubuntu-latest
26+
deps:oldest
27+
runs-on:${{ matrix.os }}
1228
steps:
1329
-uses:actions/checkout@v3
1430
with:
1531
submodules:true
16-
-uses:actions/setup-python@v4
32+
-if:${{ matrix.deps == 'base' }}
33+
uses:actions/setup-python@v4
1734
with:
1835
python-version:${{ matrix.python }}
1936
cache:pip
20-
cache-dependency-path:"requirements*.txt"
37+
cache-dependency-path:|
38+
requirements.txt
39+
requirements-test.txt
40+
-if:${{ matrix.deps == 'optional' }}
41+
uses:actions/setup-python@v4
42+
with:
43+
python-version:${{ matrix.python }}
44+
cache:pip
45+
cache-dependency-path:|
46+
requirements.txt
47+
requirements-optional.txt
48+
requirements-test.txt
49+
-if:${{ matrix.deps == 'oldest' }}
50+
uses:actions/setup-python@v4
51+
with:
52+
python-version:${{ matrix.python }}
53+
cache:pip
54+
cache-dependency-path:|
55+
requirements-oldest.txt
56+
-if:${{ matrix.os == 'windows-latest' }}
57+
name:Determine environment name for Tox (PowerShell)
58+
run:python toxver.py ${{ matrix.python }} ${{ matrix.deps }} >> $env:GITHUB_ENV
59+
-if:${{ matrix.os == 'ubuntu-latest' }}
60+
name:Determine environment name for Tox (Bash)
61+
run:python toxver.py ${{ matrix.python }} ${{ matrix.deps }} >> $GITHUB_ENV
2162
-run:pip install tox
22-
-run:tox -e py
63+
-run:tox
2364
-if:${{ always() }}
2465
run:python debug-info.py

‎requirements-install.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎requirements-oldest.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This allows us to install the actually oldest supported dependencies and test whether that works.
2+
3+
# requirements.txt
4+
six==1.9
5+
webencodings==0.5.1
6+
7+
# requirements-optional.txt
8+
genshi==0.7.1 ; python_version < '3.8'
9+
genshi==0.7.6 ; python_version >= '3.8'
10+
chardet==2.2.1
11+
# this should be 3.4.0 but there are no Linux
12+
# binary wheels for older releases
13+
lxml==3.8.0 ; python_version < '3.7'
14+
# minimums for 3.x are actually different:
15+
# - 3.7 is actually 4.1.1
16+
# - 3.8 is actually 4.3.5
17+
# - 3.9-3.10 is actually 4.5.2
18+
# - 3.11 is actually 4.9.0
19+
lxml==4.9.0 ; python_version >= '3.7'
20+
21+
# requirements-test.txt
22+
flake8==3.9.2 ; python_version < '3.6'
23+
flake8==5.0.4; python_version >= '3.6'
24+
pytest==4.6.10 ; python_version < '3'
25+
pytest==5.4.2 ; python_version >= '3'
26+
coverage==5.1
27+
pytest-expect==1.1.0
28+
mock==3.0.5 ; python_version < '3.6'
29+
mock==4.0.2 ; python_version >= '3.6'

‎requirements-optional.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
# We support a Genshi treewalker that can be used to serialize Genshi
44
# streams.
5-
genshi
5+
genshi>=0.7.1
66

77
# chardet can be used as a fallback in case we are unable to determine
88
# the encoding of a document.
9-
chardet>=2.2
9+
chardet>=2.2.1
1010

1111
# lxml is supported with its own treebuilder ("lxml") and otherwise
1212
# uses the standard ElementTree support
13-
lxml ; platform_python_implementation == 'CPython'
13+
lxml>=3.4.0 ; platform_python_implementation == 'CPython'

‎requirements-test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-r requirements.txt
22

3-
tox>=3.15.1,<4
4-
flake8>=3.8.1,<6
3+
flake8==3.9.2 ; python_version < '3.6'
4+
flake8>=5.0.4; python_version >= '3.6'
55
pytest>=4.6.10,<5 ; python_version < '3'
66
pytest>=5.4.2,<7 ; python_version >= '3'
77
coverage>=5.1,<6

‎setup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,23 @@ def default_environment():
108108
packages=find_packages(exclude=["*.tests","*.tests.*","tests.*","tests"]),
109109
install_requires=[
110110
'six>=1.9',
111-
'webencodings',
111+
'webencodings>=0.5.1',
112112
],
113113
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
114114
extras_require={
115115
# A conditional extra will only install these items when the extra is
116116
# requested and the condition matches.
117-
"lxml:platform_python_implementation == 'CPython'": ["lxml"],
117+
"lxml:platform_python_implementation == 'CPython'": ["lxml>=3.4.0"],
118118

119119
# Standard extras, will be installed when the extra is requested.
120-
"genshi": ["genshi"],
121-
"chardet": ["chardet>=2.2"],
120+
"genshi": ["genshi>=0.7.1"],
121+
"chardet": ["chardet>=2.2.1"],
122122

123123
# The all extra combines a standard extra which will be used anytime
124124
# the all extra is requested, and it extends it with a conditional
125125
# extra that will be installed whenever the condition matches and the
126126
# all extra is requested.
127-
"all": ["genshi","chardet>=2.2"],
128-
"all:platform_python_implementation == 'CPython'": ["lxml"],
127+
"all": ["genshi>=0.7.1","chardet>=2.2.1"],
128+
"all:platform_python_implementation == 'CPython'": ["lxml>=3.4.0"],
129129
},
130130
)

‎tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
[tox]
2-
envlist = py{27,35,36,37,38,39,310,311,py,py3}-{base,six19,optional}
2+
envlist = py{27,35,36,37,38,39,310,311,py,py3}-{base,optional,oldest}
33

44
[testenv]
55
deps =
6+
base: -r{toxinidir}/requirements-test.txt
7+
optional: -r{toxinidir}/requirements-test.txt
68
optional: -r{toxinidir}/requirements-optional.txt
7-
-r{toxinidir}/requirements-test.txt
9+
oldest:-r{toxinidir}/requirements-oldest.txt
810
doc: Sphinx
911

1012
passenv =
1113
PYTEST_COMMAND# this is maintained so one can, e.g., PYTEST_COMMAND="coverage run -m pytest"
1214
COVERAGE_RUN_OPTIONS
1315
commands =
14-
six19: pip installsix==1.9
1516
{env:PYTEST_COMMAND:{envbindir}/pytest} {posargs}
1617
flake8 {toxinidir}
1718

‎toxver.py

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/usr/bin/env python
2+
3+
"""
4+
usage: toxver.py [python-version] [deps]
5+
6+
Returns a Tox environment name given a GHA matrix Python version and dependencies.
7+
Many GHA configurations do this with inline Bash scripts but we want our solution
8+
to be cross-platform and work on Windows workers, too.
9+
10+
Examples:
11+
12+
$ toxver.py pypy-3.8 base
13+
TOXENV=pypy3-base
14+
15+
$ toxver.py 2.7 oldest
16+
TOXENV=py27-oldest
17+
18+
$ toxver.py ~3.12.0-0 optional
19+
TOXENV=py312-optional
20+
21+
"""
22+
23+
from __future__importabsolute_import
24+
from __future__importdivision
25+
from __future__importprint_function
26+
from __future__importunicode_literals
27+
28+
importsys
29+
30+
31+
defmain(argv):
32+
iflen(argv)!=3:
33+
print(__doc__.strip(),file=sys.stderr)
34+
return1
35+
36+
deps=argv[2]
37+
38+
ifargv[1].startswith("pypy-2"):
39+
print("TOXENV=pypy-"+deps)
40+
return0
41+
42+
ifargv[1].startswith("pypy-3"):
43+
print("TOXENV=pypy3-"+deps)
44+
return0
45+
46+
ifargv[1].startswith("~"):
47+
ver=argv[1][1:5]
48+
else:
49+
ver=argv[1]
50+
51+
ver=ver.replace(".","")
52+
print("TOXENV=py"+ver+"-"+deps)
53+
return0
54+
55+
56+
if__name__=="__main__":
57+
sys.exit(main(sys.argv))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp