Skip to content

Commit 2f1437e

Browse files
authored
fix: pytest-selenium, pytest-variables, pyjwkest dependency issues (openedx-unsupported#3987)
1 parent 6b88537 commit 2f1437e

File tree

10 files changed

+244
-265
lines changed

10 files changed

+244
-265
lines changed

requirements/base.txt

+39-52
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ analytics-python==1.4.post1
1414
# via -r requirements/base.in
1515
app-store-notifications-v2-validator==0.0.7
1616
# via -r requirements/base.in
17-
asgiref==3.6.0
17+
asgiref==3.7.2
1818
# via django
1919
asn1crypto==1.5.1
2020
# via cybersource-rest-client-python
@@ -39,13 +39,13 @@ billiard==3.6.4.0
3939
# via celery
4040
bleach==6.0.0
4141
# via -r requirements/base.in
42-
boto3==1.26.133
42+
boto3==1.26.155
4343
# via -r requirements/base.in
44-
botocore==1.29.133
44+
botocore==1.29.155
4545
# via
4646
# boto3
4747
# s3transfer
48-
cachetools==5.3.0
48+
cachetools==5.3.1
4949
# via google-auth
5050
celery==4.4.7
5151
# via
@@ -72,20 +72,16 @@ click==8.1.3
7272
configparser==5.3.0
7373
# via cybersource-rest-client-python
7474
coreapi==2.3.3
75-
# via
76-
# -r requirements/base.in
77-
# drf-yasg
75+
# via -r requirements/base.in
7876
coreschema==0.0.4
79-
# via
80-
# coreapi
81-
# drf-yasg
82-
coverage==7.2.5
77+
# via coreapi
78+
coverage==7.2.7
8379
# via cybersource-rest-client-python
8480
crispy-bootstrap3==2022.1
8581
# via -r requirements/base.in
8682
crypto==1.4.1
8783
# via cybersource-rest-client-python
88-
cryptography==40.0.2
84+
cryptography==41.0.1
8985
# via
9086
# app-store-notifications-v2-validator
9187
# cybersource-rest-client-python
@@ -95,7 +91,7 @@ cryptography==40.0.2
9591
# social-auth-core
9692
cssselect==1.2.0
9793
# via premailer
98-
cssutils==2.6.0
94+
cssutils==2.7.1
9995
# via premailer
10096
cybersource-rest-client-python==0.0.21
10197
# via
@@ -148,7 +144,7 @@ django-compressor==4.3.1
148144
# django-libsass
149145
django-config-models==2.3.0
150146
# via -r requirements/base.in
151-
django-cors-headers==3.14.0
147+
django-cors-headers==4.1.0
152148
# via -r requirements/base.in
153149
django-crispy-forms==2.0
154150
# via
@@ -158,7 +154,7 @@ django-crum==0.7.9
158154
# via
159155
# edx-django-utils
160156
# edx-rbac
161-
django-extensions==3.2.1
157+
django-extensions==3.2.3
162158
# via -r requirements/base.in
163159
django-extra-views==0.13.0
164160
# via django-oscar
@@ -180,7 +176,7 @@ django-simple-history==3.0.0
180176
# via
181177
# -c requirements/common_constraints.txt
182178
# -r requirements/base.in
183-
django-solo==2.0.0
179+
django-solo==2.1.0
184180
# via -r requirements/base.in
185181
django-tables2==2.4.1
186182
# via django-oscar
@@ -213,7 +209,7 @@ drf-extensions==0.7.1
213209
# via -r requirements/base.in
214210
drf-jwt==1.19.2
215211
# via edx-drf-extensions
216-
drf-yasg==1.21.5
212+
drf-yasg==1.21.6
217213
# via -r requirements/base.in
218214
edx-auth-backends==4.1.0
219215
# via -r requirements/base.in
@@ -223,26 +219,26 @@ edx-django-release-util==1.2.0
223219
# via -r requirements/base.in
224220
edx-django-sites-extensions==4.0.0
225221
# via -r requirements/base.in
226-
edx-django-utils==5.4.0
222+
edx-django-utils==5.5.0
227223
# via
228224
# -r requirements/base.in
229225
# django-config-models
230226
# edx-drf-extensions
231227
# edx-rest-api-client
232228
# getsmarter-api-clients
233-
edx-drf-extensions==8.7.0
229+
edx-drf-extensions==8.8.0
234230
# via
235231
# -r requirements/base.in
236232
# edx-rbac
237-
edx-ecommerce-worker==3.3.3
233+
edx-ecommerce-worker==3.3.4
238234
# via -r requirements/base.in
239235
edx-opaque-keys==2.3.0
240236
# via
241237
# -r requirements/base.in
242238
# edx-drf-extensions
243239
edx-rbac==1.7.0
244240
# via -r requirements/base.in
245-
edx-rest-api-client==5.5.0
241+
edx-rest-api-client==5.5.2
246242
# via
247243
# -r requirements/base.in
248244
# edx-ecommerce-worker
@@ -254,9 +250,9 @@ extras==1.0.0
254250
# python-subunit
255251
factory-boy==2.12.0
256252
# via django-oscar
257-
faker==18.7.0
253+
faker==18.10.1
258254
# via factory-boy
259-
fixtures==4.0.1
255+
fixtures==4.1.0
260256
# via
261257
# cybersource-rest-client-python
262258
# testtools
@@ -266,24 +262,22 @@ frozenlist==1.3.3
266262
# aiosignal
267263
funcsigs==1.0.2
268264
# via cybersource-rest-client-python
269-
future==0.18.3
270-
# via pyjwkest
271-
getsmarter-api-clients==0.5.4
265+
getsmarter-api-clients==0.6.0
272266
# via -r requirements/base.in
273-
google-api-core==2.11.0
267+
google-api-core==2.11.1
274268
# via google-api-python-client
275269
google-api-python-client==2.31.0
276270
# via
277271
# -r requirements/base.in
278272
# inapppy
279-
google-auth==2.18.0
273+
google-auth==2.20.0
280274
# via
281275
# google-api-core
282276
# google-api-python-client
283277
# google-auth-httplib2
284278
google-auth-httplib2==0.1.0
285279
# via google-api-python-client
286-
googleapis-common-protos==1.59.0
280+
googleapis-common-protos==1.59.1
287281
# via google-api-core
288282
httplib2==0.20.2
289283
# via
@@ -339,7 +333,7 @@ lxml==4.9.2
339333
# zeep
340334
markdown==2.6.9
341335
# via -r requirements/base.in
342-
markupsafe==2.1.2
336+
markupsafe==2.1.3
343337
# via jinja2
344338
monotonic==1.6
345339
# via analytics-python
@@ -370,7 +364,7 @@ oauthlib==3.2.2
370364
# social-auth-core
371365
packaging==23.1
372366
# via drf-yasg
373-
paramiko==3.1.0
367+
paramiko==3.2.0
374368
# via cybersource-rest-client-python
375369
path-py==7.2
376370
# via -r requirements/base.in
@@ -382,17 +376,17 @@ pbr==5.11.1
382376
# fixtures
383377
# stevedore
384378
# testtools
385-
phonenumbers==8.13.11
379+
phonenumbers==8.13.14
386380
# via django-oscar
387381
pillow==9.5.0
388382
# via django-oscar
389383
pkgutil-resolve-name==1.3.10
390384
# via jsonschema
391-
platformdirs==3.5.1
385+
platformdirs==3.6.0
392386
# via zeep
393387
premailer==2.9.2
394388
# via -r requirements/base.in
395-
protobuf==4.23.0
389+
protobuf==4.23.3
396390
# via
397391
# google-api-core
398392
# googleapis-common-protos
@@ -419,16 +413,12 @@ pycparser==2.21
419413
# app-store-notifications-v2-validator
420414
# cffi
421415
# cybersource-rest-client-python
422-
pycryptodome==3.17
416+
pycryptodome==3.18.0
417+
# via cybersource-rest-client-python
418+
pycryptodomex==3.18.0
423419
# via cybersource-rest-client-python
424-
pycryptodomex==3.17
425-
# via
426-
# cybersource-rest-client-python
427-
# pyjwkest
428420
pygments==2.15.1
429421
# via -r requirements/base.in
430-
pyjwkest==1.4.2
431-
# via edx-drf-extensions
432422
pyjwt[crypto]==2.7.0
433423
# via
434424
# app-store-notifications-v2-validator
@@ -445,13 +435,13 @@ pynacl==1.5.0
445435
# cybersource-rest-client-python
446436
# edx-django-utils
447437
# paramiko
448-
pyopenssl==23.1.1
438+
pyopenssl==23.2.0
449439
# via
450440
# app-store-notifications-v2-validator
451441
# cybersource-rest-client-python
452442
# ndg-httpsclient
453443
# paypalrestsdk
454-
pyparsing==3.0.9
444+
pyparsing==3.1.0
455445
# via httplib2
456446
pypi==2.1
457447
# via cybersource-rest-client-python
@@ -490,13 +480,14 @@ pytz==2023.3
490480
pyyaml==6.0
491481
# via
492482
# cybersource-rest-client-python
483+
# drf-yasg
493484
# edx-django-release-util
494485
# naked
495486
rcssmin==1.1.1
496487
# via django-compressor
497488
redis==4.5.5
498489
# via edx-ecommerce-worker
499-
requests==2.30.0
490+
requests==2.31.0
500491
# via
501492
# -r requirements/base.in
502493
# analytics-python
@@ -508,7 +499,6 @@ requests==2.30.0
508499
# inapppy
509500
# naked
510501
# paypalrestsdk
511-
# pyjwkest
512502
# requests-file
513503
# requests-oauthlib
514504
# requests-toolbelt
@@ -532,10 +522,6 @@ rsa==4.9
532522
# google-auth
533523
# inapppy
534524
# oauth2client
535-
ruamel-yaml==0.17.26
536-
# via drf-yasg
537-
ruamel-yaml-clib==0.2.7
538-
# via ruamel-yaml
539525
rules==3.3
540526
# via -r requirements/base.in
541527
s3transfer==0.6.1
@@ -567,7 +553,6 @@ six==1.16.0
567553
# oauth2client
568554
# paypalrestsdk
569555
# purl
570-
# pyjwkest
571556
# python-dateutil
572557
# requests-file
573558
slumber==0.7.1
@@ -584,7 +569,7 @@ sorl-thumbnail==12.9.0
584569
# via -r requirements/base.in
585570
sqlparse==0.4.4
586571
# via django
587-
stevedore==5.0.0
572+
stevedore==5.1.0
588573
# via
589574
# edx-django-utils
590575
# edx-opaque-keys
@@ -598,6 +583,8 @@ traceback2==1.4.0
598583
# via cybersource-rest-client-python
599584
typing==3.7.4.3
600585
# via cybersource-rest-client-python
586+
typing-extensions==4.6.3
587+
# via asgiref
601588
unicodecsv==0.14.1
602589
# via
603590
# -r requirements/base.in
@@ -607,7 +594,7 @@ uritemplate==4.1.1
607594
# coreapi
608595
# drf-yasg
609596
# google-api-python-client
610-
urllib3==1.26.15
597+
urllib3==1.26.16
611598
# via
612599
# -c requirements/constraints.txt
613600
# botocore

requirements/constraints.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,15 @@ idna==2.7
3333
# TODO : Pinning this until we are sure there aren't any breaking changes, then we'll upgrade.
3434
celery<5.0.0
3535

36-
# bok-choy 1.1.1 requires <4 (can remove once we have a version without that requirement)
36+
# bok-choy 2.0.1 still requires selenium<4
37+
# (bok-choy is now deprecated; updates unlikely)
38+
# - pytest-selenium v3 has inconsistent pytest dependency requirements
39+
# (see pytest-selenium/issues/294)
40+
# - pytest-variables v3 uses pytest.stash instead of _variables. This
41+
# conflicts with how pytest-selenium uses variables prior to v3.
3742
selenium<4.0.0
38-
pytest-selenium<4.0.0
43+
pytest-selenium<3.0.0
44+
pytest-variables<3.0.0
3945

4046
# pylint>2.12.2 requires a lot of quality fixes. Can be resolved later on.
4147
pylint==2.12.2

0 commit comments

Comments
 (0)