Skip to content

Commit c566629

Browse files
committed
Revert "fixup! test: upgrade to Python 3.11 and Django 4.2"
This reverts commit 340d4e0.
1 parent 6d47e0c commit c566629

File tree

6 files changed

+63
-36
lines changed

6 files changed

+63
-36
lines changed

requirements/ci.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ filelock==3.17.0
1111
# tox
1212
# virtualenv
1313
packaging==24.2
14-
# via
15-
# pyproject-api
16-
# tox
14+
# via tox
1715
platformdirs==4.3.6
1816
# via
1917
# tox
2018
# virtualenv
21-
pluggy==1.5.0
22-
# via tox
19+
pluggy==0.13.1
20+
# via
21+
# -c requirements/constraints.txt
22+
# tox
2323
py==1.11.0
2424
# via tox
2525
six==1.17.0

requirements/constraints.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@
1010

1111
# Common constraints for edx repos
1212
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
13+
14+
15+
# Newer versions of pytest fail because `edx-completion` defines `default_app_config`:
16+
# https://github.com/openedx/completion/blob/v4.2.0/completion/__init__.py#L7
17+
pytest<6.0.0
18+
pluggy<1.0.0

requirements/dev.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ attrs==25.1.0
3333
# via
3434
# -r requirements/quality.txt
3535
# openedx-events
36+
# pytest
3637
billiard==4.2.1
3738
# via
3839
# -r requirements/quality.txt
@@ -274,10 +275,6 @@ idna==3.10
274275
# via
275276
# -r requirements/quality.txt
276277
# requests
277-
iniconfig==2.0.0
278-
# via
279-
# -r requirements/quality.txt
280-
# pytest
281278
isodate==0.7.2
282279
# via
283280
# -r requirements/quality.txt
@@ -339,7 +336,9 @@ mccabe==0.7.0
339336
mock==3.0.5
340337
# via -r requirements/quality.txt
341338
more-itertools==5.0.0
342-
# via -r requirements/quality.txt
339+
# via
340+
# -r requirements/quality.txt
341+
# pytest
343342
mysqlclient==2.2.7
344343
# via -r requirements/quality.txt
345344
newrelic==10.6.0
@@ -386,8 +385,9 @@ platformdirs==4.3.6
386385
# -r requirements/quality.txt
387386
# pylint
388387
# virtualenv
389-
pluggy==1.5.0
388+
pluggy==0.13.1
390389
# via
390+
# -c requirements/constraints.txt
391391
# -r requirements/ci.txt
392392
# -r requirements/quality.txt
393393
# pytest
@@ -407,6 +407,8 @@ psutil==7.0.0
407407
py==1.11.0
408408
# via
409409
# -r requirements/ci.txt
410+
# -r requirements/quality.txt
411+
# pytest
410412
# tox
411413
pycodestyle==2.12.1
412414
# via -r requirements/quality.txt
@@ -455,14 +457,15 @@ pyproject-hooks==1.2.0
455457
# -r requirements/pip-tools.txt
456458
# build
457459
# pip-tools
458-
pytest==8.3.5
460+
pytest==5.4.3
459461
# via
462+
# -c requirements/constraints.txt
460463
# -r requirements/quality.txt
461464
# pytest-cov
462465
# pytest-django
463466
pytest-cov==6.0.0
464467
# via -r requirements/quality.txt
465-
pytest-django==4.10.0
468+
pytest-django==4.5.2
466469
# via -r requirements/quality.txt
467470
python-dateutil==2.9.0.post0
468471
# via
@@ -590,6 +593,7 @@ wcwidth==0.2.13
590593
# via
591594
# -r requirements/quality.txt
592595
# prompt-toolkit
596+
# pytest
593597
web-fragments==2.2.0
594598
# via
595599
# -r requirements/quality.txt

requirements/doc.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ attrs==25.1.0
3636
# -r requirements/base.txt
3737
# -r requirements/test.txt
3838
# openedx-events
39+
# pytest
3940
babel==2.17.0
4041
# via sphinx
4142
billiard==4.2.1
@@ -301,10 +302,6 @@ idna==3.10
301302
# requests
302303
imagesize==1.4.1
303304
# via sphinx
304-
iniconfig==2.0.0
305-
# via
306-
# -r requirements/test.txt
307-
# pytest
308305
isodate==0.7.2
309306
# via
310307
# -r requirements/base.txt
@@ -368,7 +365,9 @@ markupsafe==3.0.2
368365
mock==3.0.5
369366
# via -r requirements/test.txt
370367
more-itertools==5.0.0
371-
# via -r requirements/test.txt
368+
# via
369+
# -r requirements/test.txt
370+
# pytest
372371
mysqlclient==2.2.7
373372
# via -r requirements/test.txt
374373
newrelic==10.6.0
@@ -411,7 +410,7 @@ pbr==6.1.1
411410
# -r requirements/base.txt
412411
# -r requirements/test.txt
413412
# stevedore
414-
pluggy==1.5.0
413+
pluggy==0.13.1
415414
# via
416415
# -r requirements/test.txt
417416
# pytest
@@ -429,6 +428,10 @@ psutil==7.0.0
429428
# -r requirements/base.txt
430429
# -r requirements/test.txt
431430
# edx-django-utils
431+
py==1.11.0
432+
# via
433+
# -r requirements/test.txt
434+
# pytest
432435
pycparser==2.22
433436
# via
434437
# -r requirements/base.txt
@@ -456,14 +459,14 @@ pynacl==1.5.0
456459
# -r requirements/base.txt
457460
# -r requirements/test.txt
458461
# edx-django-utils
459-
pytest==8.3.5
462+
pytest==5.4.3
460463
# via
461464
# -r requirements/test.txt
462465
# pytest-cov
463466
# pytest-django
464467
pytest-cov==6.0.0
465468
# via -r requirements/test.txt
466-
pytest-django==4.10.0
469+
pytest-django==4.5.2
467470
# via -r requirements/test.txt
468471
python-dateutil==2.9.0.post0
469472
# via
@@ -613,6 +616,7 @@ wcwidth==0.2.13
613616
# -r requirements/base.txt
614617
# -r requirements/test.txt
615618
# prompt-toolkit
619+
# pytest
616620
web-fragments==2.2.0
617621
# via
618622
# -r requirements/base.txt

requirements/quality.txt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ attrs==25.1.0
3232
# via
3333
# -r requirements/test.txt
3434
# openedx-events
35+
# pytest
3536
billiard==4.2.1
3637
# via
3738
# -r requirements/test.txt
@@ -254,10 +255,6 @@ idna==3.10
254255
# via
255256
# -r requirements/test.txt
256257
# requests
257-
iniconfig==2.0.0
258-
# via
259-
# -r requirements/test.txt
260-
# pytest
261258
isodate==0.7.2
262259
# via
263260
# -r requirements/test.txt
@@ -317,7 +314,9 @@ mccabe==0.7.0
317314
mock==3.0.5
318315
# via -r requirements/test.txt
319316
more-itertools==5.0.0
320-
# via -r requirements/test.txt
317+
# via
318+
# -r requirements/test.txt
319+
# pytest
321320
mysqlclient==2.2.7
322321
# via -r requirements/test.txt
323322
newrelic==10.6.0
@@ -354,8 +353,9 @@ pbr==6.1.1
354353
# stevedore
355354
platformdirs==4.3.6
356355
# via pylint
357-
pluggy==1.5.0
356+
pluggy==0.13.1
358357
# via
358+
# -c requirements/constraints.txt
359359
# -r requirements/test.txt
360360
# pytest
361361
polib==1.2.0
@@ -370,6 +370,10 @@ psutil==7.0.0
370370
# via
371371
# -r requirements/test.txt
372372
# edx-django-utils
373+
py==1.11.0
374+
# via
375+
# -r requirements/test.txt
376+
# pytest
373377
pycodestyle==2.12.1
374378
# via -r requirements/quality.in
375379
pycparser==2.22
@@ -406,14 +410,15 @@ pynacl==1.5.0
406410
# via
407411
# -r requirements/test.txt
408412
# edx-django-utils
409-
pytest==8.3.5
413+
pytest==5.4.3
410414
# via
415+
# -c requirements/constraints.txt
411416
# -r requirements/test.txt
412417
# pytest-cov
413418
# pytest-django
414419
pytest-cov==6.0.0
415420
# via -r requirements/test.txt
416-
pytest-django==4.10.0
421+
pytest-django==4.5.2
417422
# via -r requirements/test.txt
418423
python-dateutil==2.9.0.post0
419424
# via
@@ -525,6 +530,7 @@ wcwidth==0.2.13
525530
# via
526531
# -r requirements/test.txt
527532
# prompt-toolkit
533+
# pytest
528534
web-fragments==2.2.0
529535
# via
530536
# -r requirements/test.txt

requirements/test.txt

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ attrs==25.1.0
2828
# via
2929
# -r requirements/base.txt
3030
# openedx-events
31+
# pytest
3132
billiard==4.2.1
3233
# via
3334
# -r requirements/base.txt
@@ -237,8 +238,6 @@ idna==3.10
237238
# via
238239
# -r requirements/base.txt
239240
# requests
240-
iniconfig==2.0.0
241-
# via pytest
242241
isodate==0.7.2
243242
# via
244243
# -r requirements/base.txt
@@ -288,7 +287,9 @@ markupsafe==3.0.2
288287
mock==3.0.5
289288
# via -r requirements/test.in
290289
more-itertools==5.0.0
291-
# via -r requirements/test.in
290+
# via
291+
# -r requirements/test.in
292+
# pytest
292293
mysqlclient==2.2.7
293294
# via -r requirements/test.in
294295
newrelic==10.6.0
@@ -317,8 +318,10 @@ pbr==6.1.1
317318
# via
318319
# -r requirements/base.txt
319320
# stevedore
320-
pluggy==1.5.0
321-
# via pytest
321+
pluggy==0.13.1
322+
# via
323+
# -c requirements/constraints.txt
324+
# pytest
322325
polib==1.2.0
323326
# via edx-i18n-tools
324327
prompt-toolkit==3.0.50
@@ -329,6 +332,8 @@ psutil==7.0.0
329332
# via
330333
# -r requirements/base.txt
331334
# edx-django-utils
335+
py==1.11.0
336+
# via pytest
332337
pycparser==2.22
333338
# via
334339
# -r requirements/base.txt
@@ -347,14 +352,15 @@ pynacl==1.5.0
347352
# via
348353
# -r requirements/base.txt
349354
# edx-django-utils
350-
pytest==8.3.5
355+
pytest==5.4.3
351356
# via
357+
# -c requirements/constraints.txt
352358
# -r requirements/test.in
353359
# pytest-cov
354360
# pytest-django
355361
pytest-cov==6.0.0
356362
# via -r requirements/test.in
357-
pytest-django==4.10.0
363+
pytest-django==4.5.2
358364
# via -r requirements/test.in
359365
python-dateutil==2.9.0.post0
360366
# via
@@ -462,6 +468,7 @@ wcwidth==0.2.13
462468
# via
463469
# -r requirements/base.txt
464470
# prompt-toolkit
471+
# pytest
465472
web-fragments==2.2.0
466473
# via
467474
# -r requirements/base.txt

0 commit comments

Comments
 (0)