Skip to content

Commit 628cccf

Browse files
committed
ci: consolidate CI workflows and update test dependencies for Python version compatibility
1 parent 53e6aaf commit 628cccf

File tree

3 files changed

+18
-25
lines changed

3 files changed

+18
-25
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ jobs:
77
runs-on: ubuntu-22.04
88
strategy:
99
matrix:
10-
# python: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
1110
python: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
12-
# urllib3-line: ["lt2", "ge2"]
13-
urllib3-line: ["lt2"]
14-
# exclude:
15-
# - python: "3.7"
16-
# urllib3-line: "ge2"
17-
# - python: "3.8"
18-
# urllib3-line: "ge2"
11+
urllib3-line: ["lt2", "ge2"]
12+
exclude:
13+
- python: "3.7"
14+
urllib3-line: "ge2"
15+
- python: "3.8"
16+
urllib3-line: "ge2"
1917
steps:
2018
- uses: actions/checkout@v5
2119
- name: Setup Python

requirements/requirements.txt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
requests_toolbelt>=1.0.0
22

33
# ------------ Python >= 3.9 ------------
4-
# Requests 2.32.0/2.32.1 were yanked; start at 2.32.2.
5-
# urllib3 2.x requires Python >=3.9; exclude 2.0.0 (known bug).
64
requests>=2.32.2; python_version >= "3.9"
7-
urllib3!=2.0.0,<3; python_version >= "3.9"
5+
urllib3<3; python_version >= "3.9"
6+
responses>=0.25.0; python_version >= "3.9"
87

98
# ------------ 3.7 <= Python < 3.9 ------------
10-
# Latest Requests that still supports 3.7/3.8 is 2.31.x.
119
requests>=2.22.0,<2.32; python_version >= "3.7" and python_version < "3.9"
12-
# urllib3<2 keeps behavior consistent on these Pythons.
1310
urllib3<2; python_version >= "3.7" and python_version < "3.9"
11+
responses>=0.23.0,<0.25; python_version >= "3.7" and python_version < "3.9"
1412

15-
# ------------ Python < 3.7 (i.e., 3.6) ------------
16-
# 2.27.x was the last Requests series for 3.6.
13+
# ------------ Python < 3.7 ------------
1714
requests>=2.22.0,<2.28; python_version < "3.7"
18-
urllib3<2; python_version < "3.7"
15+
urllib3<2; python_version < "3.7"
16+
responses>=0.20.0,<0.22; python_version < "3.7"

requirements/test.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
requests_toolbelt>=1.0.0
22

33
# ------------ Python >= 3.9 ------------
4-
# Requests 2.32.0/2.32.1 were yanked; start at 2.32.2.
5-
# urllib3 2.x requires Python >=3.9; exclude 2.0.0 (known bug).
64
requests>=2.32.2; python_version >= "3.9"
7-
urllib3!=2.0.0,<3; python_version >= "3.9"
5+
urllib3<3; python_version >= "3.9"
6+
responses>=0.25.0; python_version >= "3.9"
87

98
# ------------ 3.7 <= Python < 3.9 ------------
10-
# Latest Requests that still supports 3.7/3.8 is 2.31.x.
119
requests>=2.22.0,<2.32; python_version >= "3.7" and python_version < "3.9"
12-
# urllib3<2 keeps behavior consistent on these Pythons.
1310
urllib3<2; python_version >= "3.7" and python_version < "3.9"
11+
responses>=0.23.0,<0.25; python_version >= "3.7" and python_version < "3.9"
1412

15-
# ------------ Python < 3.7 (i.e., 3.6) ------------
16-
# 2.27.x was the last Requests series for 3.6.
13+
# ------------ Python < 3.7 ------------
1714
requests>=2.22.0,<2.28; python_version < "3.7"
1815
urllib3<2; python_version < "3.7"
16+
responses>=0.20.0,<0.22; python_version < "3.7"
1917

2018
black==19.10b0
2119
coverage==4.5.4
22-
tox==3.14.2
23-
responses==0.17.0
20+
tox==3.14.2

0 commit comments

Comments
 (0)