Skip to content

Commit 688fc83

Browse files
webknjazwebknjaz
committed
Revert "Merge pull request #633 from cherrypy/debt/drop-py37"
This reverts commit f82aee6, reversing changes made to 2b3b3eb.
1 parent 3591a1c commit 688fc83

25 files changed

+1792
-1
lines changed

‎.github/workflows/ci-cd.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ env:
6666
PRE_COMMIT_COLOR: always
6767
PY_COLORS: 1 # Recognized by the `py` package, dependency of `pytest`
6868
PYTHONIOENCODING: utf-8
69+
PYTHONLEGACYWINDOWSSTDIO: 1 # Python 3.6 hack
6970
PYTHONUTF8: 1
7071
TOX_PARALLEL_NO_SPINNER: 1
7172
TOX_TESTENV_PASSENV: >- # Make tox-wrapped tools see color requests
@@ -911,13 +912,46 @@ jobs:
911912
3.10
912913
- 3.9
913914
- 3.8
915+
- pypy-3.7
916+
- 3.7
917+
- 3.6
918+
- pypy-3.6
914919
os:
915920
- ubuntu-22.04
916921
- ubuntu-20.04
917922
- macos-11.0
918923
- macos-latest
919924
- windows-2019
920925
- windows-2022
926+
exclude:
927+
# NOTE: Windows PyPy jobs are excluded to address the tox bug
928+
# NOTE: https://github.com/tox-dev/tox/issues/1704.
929+
# NOTE: They should be re-added once it's fixed.
930+
- os: windows-2022
931+
python-version: pypy-3.6
932+
- os: windows-2019
933+
python-version: pypy-3.6
934+
# NOTE: Windows PyPy 3.7 jobs are excluded because of the lack
935+
# NOTE: of the build deps to compile cryptography.
936+
# NOTE: They should be re-added once it's fixed.
937+
- os: windows-2022
938+
python-version: pypy-3.7
939+
- os: windows-2019
940+
python-version: pypy-3.7
941+
# NOTE: macOS PyPy jobs are excluded because installing cryptography
942+
# NOTE: needs openssl headers that aren't present at the moment.
943+
# TODO: Remove the exclusions once this is addressed.
944+
- os: macOS-11.0
945+
python-version: pypy-3.6
946+
- os: macos-latest
947+
python-version: pypy-3.6
948+
- os: macos-11.0
949+
python-version: pypy-3.7
950+
- os: macos-latest
951+
python-version: pypy-3.7
952+
# NOTE: Python 3.6 is not available for Ubuntu 22.04
953+
- os: ubuntu-22.04
954+
python-version: 3.6
921955

922956
continue-on-error: >-
923957
${{
@@ -1021,6 +1055,16 @@ jobs:
10211055
--user
10221056
'${{ env.TOX_VERSION }}'
10231057
1058+
- name: Patch tox.ini for Python 3.6 under Windows
1059+
if: >-
1060+
runner.os == 'Windows'
1061+
&& matrix.python-version == '3.6'
1062+
run: >-
1063+
sed -i
1064+
's/^package_env\(\s\)\?=.*/package_env = py36-win-dummy/g'
1065+
tox.ini
1066+
shell: bash
1067+
10241068
- name: Download all the dists
10251069
uses: actions/download-artifact@v3
10261070
with:

‎requirements/tox-py36-cp36-darwin-x86_64.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tests.in

‎requirements/tox-py36-cp36-darwin-x86_64.txt‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
#
2+
# This file is autogenerated by pip-compile with python 3.6
3+
# To update, run:
4+
#
5+
# pip-compile --allow-unsafe --output-file=requirements/tox-py36-cp36-darwin-x86_64.txt --strip-extras requirements/tox-py36-cp36-darwin-x86_64.in setup.cfg
6+
#
7+
attrs==22.2.0
8+
# via pytest
9+
certifi==2022.12.7
10+
# via requests
11+
cffi==1.15.1
12+
# via cryptography
13+
chardet==4.0.0
14+
# via requests
15+
charset-normalizer==2.0.12
16+
# via requests
17+
colorama==0.4.5
18+
# via pytest-watch
19+
commonmark==0.9.1
20+
# via rich
21+
coverage==6.2
22+
# via
23+
# -r requirements/tox-py36-cp36-darwin-x86_64.in
24+
# pytest-cov
25+
cryptography==40.0.1
26+
# via
27+
# pyopenssl
28+
# trustme
29+
dataclasses==0.8
30+
# via rich
31+
docopt==0.6.2
32+
# via pytest-watch
33+
execnet==1.9.0
34+
# via pytest-xdist
35+
idna==3.4
36+
# via
37+
# requests
38+
# trustme
39+
importlib-metadata==4.8.3 ; python_version < "3.8"
40+
# via
41+
# cheroot (setup.cfg)
42+
# pluggy
43+
# pytest
44+
# pytest-rerunfailures
45+
importlib-resources==5.4.0
46+
# via jaraco.text
47+
iniconfig==1.1.1
48+
# via pytest
49+
jaraco.context==4.1.1
50+
# via
51+
# -r requirements/tox-py36-cp36-darwin-x86_64.in
52+
# jaraco.text
53+
jaraco.functools==3.4.0
54+
# via
55+
# cheroot (setup.cfg)
56+
# jaraco.text
57+
# tempora
58+
jaraco.text==3.7.0
59+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
60+
more-itertools==8.14.0
61+
# via
62+
# cheroot (setup.cfg)
63+
# jaraco.functools
64+
packaging==21.3
65+
# via
66+
# pytest
67+
# pytest-rerunfailures
68+
# pytest-sugar
69+
pluggy==1.0.0
70+
# via pytest
71+
portend==3.0.0
72+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
73+
pprintpp==0.4.0
74+
# via pytest-clarity
75+
py==1.11.0
76+
# via
77+
# pypytools
78+
# pytest
79+
# pytest-forked
80+
pycparser==2.21
81+
# via cffi
82+
pygments==2.14.0
83+
# via rich
84+
pyopenssl==23.1.1 ; implementation_name != "pypy"
85+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
86+
pyparsing==3.0.9
87+
# via packaging
88+
pypytools==0.6.2
89+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
90+
pytest==6.2.5
91+
# via
92+
# -r requirements/tox-py36-cp36-darwin-x86_64.in
93+
# pytest-clarity
94+
# pytest-cov
95+
# pytest-forked
96+
# pytest-mock
97+
# pytest-rerunfailures
98+
# pytest-sugar
99+
# pytest-watch
100+
# pytest-xdist
101+
pytest-clarity==1.0.1
102+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
103+
pytest-cov==2.12.0
104+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
105+
pytest-forked==1.4.0 ; sys_platform != "win32"
106+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
107+
pytest-mock==3.6.1
108+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
109+
pytest-rerunfailures==10.3
110+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
111+
pytest-sugar==0.9.6
112+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
113+
pytest-watch==4.2.0
114+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
115+
pytest-xdist==3.0.2
116+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
117+
pytz==2023.3
118+
# via tempora
119+
requests==2.27.1
120+
# via
121+
# -r requirements/tox-py36-cp36-darwin-x86_64.in
122+
# requests-toolbelt
123+
# requests-unixsocket
124+
requests-toolbelt==0.10.1
125+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
126+
requests-unixsocket==0.3.0
127+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
128+
rich==12.6.0
129+
# via pytest-clarity
130+
tempora==4.1.2
131+
# via portend
132+
termcolor==1.1.0
133+
# via pytest-sugar
134+
toml==0.10.2
135+
# via pytest
136+
tomli==1.2.3
137+
# via coverage
138+
trustme==0.9.0
139+
# via -r requirements/tox-py36-cp36-darwin-x86_64.in
140+
typing-extensions==4.1.1
141+
# via
142+
# importlib-metadata
143+
# rich
144+
urllib3==1.26.15
145+
# via requests
146+
watchdog==2.3.1
147+
# via pytest-watch
148+
zipp==3.6.0
149+
# via
150+
# importlib-metadata
151+
# importlib-resources

‎requirements/tox-py36-cp36-linux-x86_64.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tests.in

‎requirements/tox-py36-cp36-linux-x86_64.txt‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
#
2+
# This file is autogenerated by pip-compile with python 3.6
3+
# To update, run:
4+
#
5+
# pip-compile --allow-unsafe --output-file=requirements/tox-py36-cp36-linux-x86_64.txt --strip-extras requirements/tox-py36-cp36-linux-x86_64.in setup.cfg
6+
#
7+
attrs==22.2.0
8+
# via pytest
9+
certifi==2022.12.7
10+
# via requests
11+
cffi==1.15.1
12+
# via cryptography
13+
chardet==4.0.0
14+
# via requests
15+
charset-normalizer==2.0.12
16+
# via requests
17+
colorama==0.4.5
18+
# via pytest-watch
19+
commonmark==0.9.1
20+
# via rich
21+
coverage==6.2
22+
# via
23+
# -r requirements/tox-py36-cp36-linux-x86_64.in
24+
# pytest-cov
25+
cryptography==40.0.1
26+
# via
27+
# pyopenssl
28+
# trustme
29+
dataclasses==0.8
30+
# via rich
31+
docopt==0.6.2
32+
# via pytest-watch
33+
execnet==1.9.0
34+
# via pytest-xdist
35+
idna==3.4
36+
# via
37+
# requests
38+
# trustme
39+
importlib-metadata==4.8.3 ; python_version < "3.8"
40+
# via
41+
# cheroot (setup.cfg)
42+
# pluggy
43+
# pytest
44+
# pytest-rerunfailures
45+
importlib-resources==5.4.0
46+
# via jaraco.text
47+
iniconfig==1.1.1
48+
# via pytest
49+
jaraco.context==4.1.1
50+
# via
51+
# -r requirements/tox-py36-cp36-linux-x86_64.in
52+
# jaraco.text
53+
jaraco.functools==3.4.0
54+
# via
55+
# cheroot (setup.cfg)
56+
# jaraco.text
57+
# tempora
58+
jaraco.text==3.7.0
59+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
60+
more-itertools==8.14.0
61+
# via
62+
# cheroot (setup.cfg)
63+
# jaraco.functools
64+
packaging==21.3
65+
# via
66+
# pytest
67+
# pytest-rerunfailures
68+
# pytest-sugar
69+
pluggy==1.0.0
70+
# via pytest
71+
portend==3.0.0
72+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
73+
pprintpp==0.4.0
74+
# via pytest-clarity
75+
py==1.11.0
76+
# via
77+
# pypytools
78+
# pytest
79+
# pytest-forked
80+
pycparser==2.21
81+
# via cffi
82+
pygments==2.14.0
83+
# via rich
84+
pyopenssl==23.1.1 ; implementation_name != "pypy"
85+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
86+
pyparsing==3.0.9
87+
# via packaging
88+
pypytools==0.6.2
89+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
90+
pytest==6.2.5
91+
# via
92+
# -r requirements/tox-py36-cp36-linux-x86_64.in
93+
# pytest-clarity
94+
# pytest-cov
95+
# pytest-forked
96+
# pytest-mock
97+
# pytest-rerunfailures
98+
# pytest-sugar
99+
# pytest-watch
100+
# pytest-xdist
101+
pytest-clarity==1.0.1
102+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
103+
pytest-cov==2.12.0
104+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
105+
pytest-forked==1.4.0 ; sys_platform != "win32"
106+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
107+
pytest-mock==3.6.1
108+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
109+
pytest-rerunfailures==10.3
110+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
111+
pytest-sugar==0.9.6
112+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
113+
pytest-watch==4.2.0
114+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
115+
pytest-xdist==3.0.2
116+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
117+
pytz==2023.3
118+
# via tempora
119+
requests==2.27.1
120+
# via
121+
# -r requirements/tox-py36-cp36-linux-x86_64.in
122+
# requests-toolbelt
123+
# requests-unixsocket
124+
requests-toolbelt==0.10.1
125+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
126+
requests-unixsocket==0.3.0
127+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
128+
rich==12.6.0
129+
# via pytest-clarity
130+
tempora==4.1.2
131+
# via portend
132+
termcolor==1.1.0
133+
# via pytest-sugar
134+
toml==0.10.2
135+
# via pytest
136+
tomli==1.2.3
137+
# via coverage
138+
trustme==0.9.0
139+
# via -r requirements/tox-py36-cp36-linux-x86_64.in
140+
typing-extensions==4.1.1
141+
# via
142+
# importlib-metadata
143+
# rich
144+
urllib3==1.26.15
145+
# via requests
146+
watchdog==2.3.1
147+
# via pytest-watch
148+
zipp==3.6.0
149+
# via
150+
# importlib-metadata
151+
# importlib-resources

‎requirements/tox-py36-cp36-win32-amd64.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tests.in

0 commit comments

Comments
 (0)