Skip to content

Commit 3e45b48

Browse files
mdmintzmdmintz
committed
Refresh Python dependencies
1 parent f693fd1 commit 3e45b48

File tree

2 files changed

+94
-163
lines changed

2 files changed

+94
-163
lines changed

‎requirements.txt

Lines changed: 37 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,62 @@
1-
pip>=21.3.1;python_version<"3.7"
2-
pip>=23.2.1;python_version>="3.7"
3-
packaging>=21.3;python_version<"3.7"
4-
packaging>=23.1;python_version>="3.7"
5-
setuptools>=59.6.0;python_version<"3.7"
6-
setuptools>=68.0.0;python_version>="3.7" and python_version<"3.8"
1+
pip>=23.2.1
2+
packaging>=23.1
3+
setuptools>=68.0.0;python_version<"3.8"
74
setuptools>=68.1.2;python_version>="3.8"
8-
wheel>=0.37.1;python_version<"3.7"
9-
wheel>=0.41.2;python_version>="3.7"
10-
attrs==22.1.0;python_version<"3.7"
11-
attrs>=23.1.0;python_version>="3.7"
5+
wheel>=0.41.2
6+
attrs>=23.1.0
127
certifi>=2023.7.22
13-
filelock>=3.4.1;python_version<"3.7"
14-
filelock>=3.12.2;python_version>="3.7" and python_version<"3.8"
8+
filelock>=3.12.2;python_version<"3.8"
159
filelock>=3.12.3;python_version>="3.8"
16-
platformdirs>=2.4.0;python_version<"3.7"
17-
platformdirs>=3.10.0;python_version>="3.7"
10+
platformdirs>=3.10.0
1811
parse>=1.19.1
1912
parse-type>=0.6.2
2013
six==1.16.0
2114
idna==3.4
22-
chardet==4.0.0;python_version<"3.7"
23-
chardet==5.2.0;python_version>="3.7"
24-
charset-normalizer==2.0.12;python_version<"3.7"
25-
charset-normalizer==3.2.0;python_version>="3.7"
26-
urllib3==1.26.12;python_version<"3.7"
27-
urllib3>=1.26.16,<2;python_version>="3.7" and python_version<"3.10"
15+
chardet==5.2.0
16+
charset-normalizer==3.2.0
17+
urllib3>=1.26.16,<2;python_version<"3.10"
2818
urllib3>=1.26.16,<2.1.0;python_version>="3.10"
29-
requests==2.27.1;python_version<"3.7"
30-
requests==2.31.0;python_version>="3.7"
19+
requests==2.31.0
3120
pynose==1.4.8
32-
sniffio==1.3.0;python_version>="3.7"
33-
h11==0.14.0;python_version>="3.7"
34-
outcome==1.2.0;python_version>="3.7"
35-
trio==0.22.2;python_version>="3.7"
36-
trio-websocket==0.10.3;python_version>="3.7"
37-
wsproto==1.2.0;python_version>="3.7"
38-
selenium==3.141.0;python_version<"3.7"
39-
selenium==4.11.2;python_version>="3.7"
40-
msedge-selenium-tools==3.141.3;python_version<"3.7"
41-
cssselect==1.1.0;python_version<"3.7"
42-
cssselect==1.2.0;python_version>="3.7"
21+
sniffio==1.3.0
22+
h11==0.14.0
23+
outcome==1.2.0
24+
trio==0.22.2
25+
trio-websocket==0.10.3
26+
wsproto==1.2.0
27+
selenium==4.11.2;python_version<"3.8"
28+
selenium==4.12.0;python_version>="3.8"
29+
cssselect==1.2.0
4330
sortedcontainers==2.4.0
44-
fasteners==0.17.3;python_version<"3.7"
45-
fasteners==0.18;python_version>="3.7"
46-
execnet==1.9.0;python_version<"3.7"
47-
execnet==2.0.2;python_version>="3.7"
48-
iniconfig==1.1.1;python_version<"3.7"
49-
iniconfig==2.0.0;python_version>="3.7"
50-
pluggy==1.0.0;python_version<"3.7"
51-
pluggy==1.2.0;python_version>="3.7" and python_version<"3.8"
31+
fasteners==0.18
32+
execnet==2.0.2
33+
iniconfig==2.0.0
34+
pluggy==1.2.0;python_version<"3.8"
5235
pluggy==1.3.0;python_version>="3.8"
5336
py==1.11.0
54-
pytest==7.0.1;python_version<"3.7"
55-
pytest==7.4.0;python_version>="3.7"
56-
pytest-forked==1.4.0;python_version<"3.7"
37+
pytest==7.4.0
5738
pytest-html==2.0.1
58-
pytest-metadata==1.11.0;python_version<"3.7"
59-
pytest-metadata==3.0.0;python_version>="3.7"
39+
pytest-metadata==3.0.0
6040
pytest-ordering==0.6
61-
pytest-rerunfailures==10.3;python_version<"3.7"
62-
pytest-rerunfailures==12.0;python_version>="3.7"
63-
pytest-xdist==2.5.0;python_version<"3.7"
64-
pytest-xdist==3.3.1;python_version>="3.7"
65-
parameterized==0.8.1;python_version<"3.7"
66-
parameterized==0.9.0;python_version>="3.7"
41+
pytest-rerunfailures==12.0
42+
pytest-xdist==3.3.1
43+
parameterized==0.9.0
6744
sbvirtualdisplay==1.2.0
6845
behave==1.2.6
69-
soupsieve==2.3.2.post1;python_version<"3.7"
70-
soupsieve==2.4.1;python_version>="3.7"
46+
soupsieve==2.4.1
7147
beautifulsoup4==4.12.2
72-
pygments==2.14.0;python_version<"3.7"
73-
pygments==2.16.1;python_version>="3.7"
48+
pygments==2.16.1
7449
pyreadline3==3.4.1;platform_system=="Windows"
7550
tabcompleter==1.2.1
7651
pdbp==1.4.6
77-
colorama==0.4.5;python_version<"3.7"
78-
colorama==0.4.6;python_version>="3.7"
79-
exceptiongroup==1.1.3;python_version>="3.7"
80-
future-breakpoint==2.0.0;python_version<"3.7"
52+
colorama==0.4.6
53+
exceptiongroup==1.1.3
8154
importlib-metadata==4.2.0;python_version<"3.8"
82-
pyotp==2.7.0;python_version<"3.7"
83-
pyotp==2.9.0;python_version>="3.7"
84-
typing-extensions==4.1.1;python_version<"3.7"
85-
commonmark==0.9.1;python_version<"3.7"
55+
pyotp==2.9.0
56+
markdown-it-py==2.2.0;python_version<"3.8"
8657
markdown-it-py==3.0.0;python_version>="3.8"
87-
mdurl==0.1.2;python_version>="3.7"
88-
rich==12.6.0;python_version<"3.7"
89-
rich==13.5.2;python_version>="3.7"
58+
mdurl==0.1.2
59+
rich==13.5.2
9060

9161
# --- Testing Requirements --- #
9262
# ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)

‎setup.py

Lines changed: 57 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -129,118 +129,83 @@
129129
"Topic :: Software Development :: Testing :: Traffic Generation",
130130
"Topic :: Utilities",
131131
],
132-
python_requires=">=3.6",
132+
python_requires=">=3.7",
133133
install_requires=[
134-
'pip>=21.3.1;python_version<"3.7"',
135-
'pip>=23.2.1;python_version>="3.7"',
136-
'packaging>=21.3;python_version<"3.7"',
137-
'packaging>=23.1;python_version>="3.7"',
138-
'setuptools>=59.6.0;python_version<"3.7"',
139-
'setuptools>=68.0.0;python_version>="3.7" and python_version<"3.8"',
134+
'pip>=23.2.1',
135+
'packaging>=23.1',
136+
'setuptools>=68.0.0;python_version<"3.8"',
140137
'setuptools>=68.1.2;python_version>="3.8"',
141-
'wheel>=0.37.1;python_version<"3.7"',
142-
'wheel>=0.41.2;python_version>="3.7"',
143-
'attrs==22.1.0;python_version<"3.7"',
144-
'attrs>=23.1.0;python_version>="3.7"',
138+
'wheel>=0.41.2',
139+
'attrs>=23.1.0',
145140
"certifi>=2023.7.22",
146-
'filelock>=3.4.1;python_version<"3.7"',
147-
'filelock>=3.12.2;python_version>="3.7" and python_version<"3.8"',
141+
'filelock>=3.12.2;python_version<"3.8"',
148142
'filelock>=3.12.3;python_version>="3.8"',
149-
'platformdirs>=2.4.0;python_version<"3.7"',
150-
'platformdirs>=3.10.0;python_version>="3.7"',
143+
'platformdirs>=3.10.0',
151144
'parse>=1.19.1',
152145
'parse-type>=0.6.2',
153146
"six==1.16.0",
154147
"idna==3.4",
155-
'chardet==4.0.0;python_version<"3.7"',
156-
'chardet==5.2.0;python_version>="3.7"',
157-
'charset-normalizer==2.0.12;python_version<"3.7"',
158-
'charset-normalizer==3.2.0;python_version>="3.7"',
159-
'urllib3==1.26.12;python_version<"3.7"',
160-
'urllib3>=1.26.16,<2;python_version>="3.7" and python_version<"3.10"', # noqa: E501
148+
'chardet==5.2.0',
149+
'charset-normalizer==3.2.0',
150+
'urllib3>=1.26.16,<2;python_version<"3.10"',
161151
'urllib3>=1.26.16,<2.1.0;python_version>="3.10"',
162-
'requests==2.27.1;python_version<"3.7"',
163-
'requests==2.31.0;python_version>="3.7"',
152+
'requests==2.31.0',
164153
"pynose==1.4.8",
165-
'sniffio==1.3.0;python_version>="3.7"',
166-
'h11==0.14.0;python_version>="3.7"',
167-
'outcome==1.2.0;python_version>="3.7"',
168-
'trio==0.22.2;python_version>="3.7"',
169-
'trio-websocket==0.10.3;python_version>="3.7"',
170-
'wsproto==1.2.0;python_version>="3.7"',
171-
'selenium==3.141.0;python_version<"3.7"',
172-
'selenium==4.11.2;python_version>="3.7"',
173-
'msedge-selenium-tools==3.141.3;python_version<"3.7"',
174-
'cssselect==1.1.0;python_version<"3.7"',
175-
'cssselect==1.2.0;python_version>="3.7"',
154+
'sniffio==1.3.0',
155+
'h11==0.14.0',
156+
'outcome==1.2.0',
157+
'trio==0.22.2',
158+
'trio-websocket==0.10.3',
159+
'wsproto==1.2.0',
160+
'selenium==4.11.2;python_version<"3.8"',
161+
'selenium==4.12.0;python_version>="3.8"',
162+
'cssselect==1.2.0',
176163
"sortedcontainers==2.4.0",
177-
'fasteners==0.17.3;python_version<"3.7"',
178-
'fasteners==0.18;python_version>="3.7"',
179-
'execnet==1.9.0;python_version<"3.7"',
180-
'execnet==2.0.2;python_version>="3.7"',
181-
'iniconfig==1.1.1;python_version<"3.7"',
182-
'iniconfig==2.0.0;python_version>="3.7"',
183-
'pluggy==1.0.0;python_version<"3.7"',
184-
'pluggy==1.2.0;python_version>="3.7" and python_version<"3.8"',
164+
'fasteners==0.18',
165+
'execnet==2.0.2',
166+
'iniconfig==2.0.0',
167+
'pluggy==1.2.0;python_version<"3.8"',
185168
'pluggy==1.3.0;python_version>="3.8"',
186169
"py==1.11.0",
187-
'pytest==7.0.1;python_version<"3.7"',
188-
'pytest==7.4.0;python_version>="3.7"',
189-
'pytest-forked==1.4.0;python_version<"3.7"',
170+
'pytest==7.4.0',
190171
"pytest-html==2.0.1", # Newer ones had issues
191-
'pytest-metadata==1.11.0;python_version<"3.7"',
192-
'pytest-metadata==3.0.0;python_version>="3.7"',
172+
'pytest-metadata==3.0.0',
193173
"pytest-ordering==0.6",
194-
'pytest-rerunfailures==10.3;python_version<"3.7"',
195-
'pytest-rerunfailures==12.0;python_version>="3.7"',
196-
'pytest-xdist==2.5.0;python_version<"3.7"',
197-
'pytest-xdist==3.3.1;python_version>="3.7"',
198-
'parameterized==0.8.1;python_version<"3.7"',
199-
'parameterized==0.9.0;python_version>="3.7"',
174+
'pytest-rerunfailures==12.0',
175+
'pytest-xdist==3.3.1',
176+
'parameterized==0.9.0',
200177
"sbvirtualdisplay==1.2.0",
201178
"behave==1.2.6",
202-
'soupsieve==2.3.2.post1;python_version<"3.7"',
203-
'soupsieve==2.4.1;python_version>="3.7"',
179+
'soupsieve==2.4.1',
204180
"beautifulsoup4==4.12.2",
205-
'pygments==2.14.0;python_version<"3.7"',
206-
'pygments==2.16.1;python_version>="3.7"',
181+
'pygments==2.16.1',
207182
'pyreadline3==3.4.1;platform_system=="Windows"',
208183
"tabcompleter==1.2.1",
209184
"pdbp==1.4.6",
210-
'colorama==0.4.5;python_version<"3.7"',
211-
'colorama==0.4.6;python_version>="3.7"',
212-
'exceptiongroup==1.1.3;python_version>="3.7"',
213-
'future-breakpoint==2.0.0;python_version<"3.7"',
185+
'colorama==0.4.6',
186+
'exceptiongroup==1.1.3',
214187
'importlib-metadata==4.2.0;python_version<"3.8"',
215-
'pyotp==2.7.0;python_version<"3.7"',
216-
'pyotp==2.9.0;python_version>="3.7"',
217-
'typing-extensions==4.1.1;python_version<"3.7"',
218-
'commonmark==0.9.1;python_version<"3.7"', # For old "rich"
219-
'markdown-it-py==3.0.0;python_version>="3.8"', # For new "rich"
220-
'mdurl==0.1.2;python_version>="3.7"', # For new "rich"
221-
'rich==12.6.0;python_version<"3.7"',
222-
'rich==13.5.2;python_version>="3.7"',
188+
'pyotp==2.9.0',
189+
'markdown-it-py==2.2.0;python_version<"3.8"',
190+
'markdown-it-py==3.0.0;python_version>="3.8"',
191+
'mdurl==0.1.2',
192+
'rich==13.5.2',
223193
],
224194
extras_require={
225195
# pip install -e .[allure]
226196
# Usage: pytest --alluredir=allure_results
227197
# Serve: allure serve allure_results
228198
"allure": [
229-
'allure-pytest==2.9.45;python_version<"3.7"',
230-
'allure-pytest==2.13.2;python_version>="3.7"',
231-
'allure-python-commons==2.9.45;python_version<"3.7"',
232-
'allure-python-commons==2.13.2;python_version>="3.7"',
233-
'allure-behave==2.9.45;python_version<"3.7"',
234-
'allure-behave==2.13.2;python_version>="3.7"',
199+
'allure-pytest==2.13.2',
200+
'allure-python-commons==2.13.2',
201+
'allure-behave==2.13.2',
235202
],
236203
# pip install -e .[coverage]
237204
# Usage: coverage run -m pytest; coverage html; coverage report
238205
"coverage": [
239-
'coverage==6.2;python_version<"3.7"',
240-
'coverage==7.2.7;python_version>="3.7" and python_version<"3.8"',
206+
'coverage==7.2.7;python_version<"3.8"',
241207
'coverage==7.3.0;python_version>="3.8"',
242-
'pytest-cov==4.0.0;python_version<"3.7"',
243-
'pytest-cov==4.1.0;python_version>="3.7"',
208+
'pytest-cov==4.1.0',
244209
],
245210
# pip install -e .[flake8]
246211
# Usage: flake8
@@ -257,16 +222,13 @@
257222
# (Not needed for debugging anymore. SeleniumBase now includes "pdbp".)
258223
"ipdb": [
259224
"ipdb==0.13.13",
260-
'ipython==7.16.3;python_version<"3.7"',
261-
'ipython==7.34.0;python_version>="3.7"',
225+
'ipython==7.34.0',
262226
],
263227
# pip install -e .[pdfminer]
264228
# (An optional library for parsing PDF files.)
265229
"pdfminer": [
266-
'pdfminer.six==20211012;python_version<"3.7"',
267-
'pdfminer.six==20221105;python_version>="3.7"',
268-
'cryptography==36.0.2;python_version<"3.7"',
269-
'cryptography==39.0.2;python_version>="3.7" and python_version<"3.9"', # noqa: E501
230+
'pdfminer.six==20221105',
231+
'cryptography==39.0.2;python_version<"3.9"',
270232
'cryptography==41.0.3;python_version>="3.9"',
271233
"cffi==1.15.1",
272234
"pycparser==2.21",
@@ -275,8 +237,7 @@
275237
# pip install -e .[pillow]
276238
# (An optional library for image-processing.)
277239
"pillow": [
278-
'Pillow==8.4.0;python_version<"3.7"',
279-
'Pillow==9.5.0;python_version>="3.7" and python_version<"3.8"',
240+
'Pillow==9.5.0;python_version<"3.8"',
280241
'Pillow==10.0.0;python_version>="3.8"',
281242
],
282243
# pip install -e .[psutil]
@@ -285,15 +246,15 @@
285246
],
286247
# pip install -e .[selenium-wire]
287248
"selenium-wire": [
288-
'selenium-wire==5.1.0;python_version>="3.7"',
289-
'Brotli==1.0.9;python_version>="3.7"',
290-
'blinker==1.6.2;python_version>="3.7"',
291-
'h2==4.1.0;python_version>="3.7"',
292-
'hpack==4.0.0;python_version>="3.7"',
293-
'hyperframe==6.0.1;python_version>="3.7"',
294-
'kaitaistruct==0.10;python_version>="3.7"',
295-
'pyasn1==0.5.0;python_version>="3.7"',
296-
'zstandard==0.21.0;python_version>="3.7"',
249+
'selenium-wire==5.1.0',
250+
'Brotli==1.0.9',
251+
'blinker==1.6.2',
252+
'h2==4.1.0',
253+
'hpack==4.0.0',
254+
'hyperframe==6.0.1',
255+
'kaitaistruct==0.10',
256+
'pyasn1==0.5.0',
257+
'zstandard==0.21.0',
297258
],
298259
},
299260
packages=[

0 commit comments

Comments
 (0)