From c566629605f8b0404eeaf86c9c8ab6e68ba73582 Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Sun, 2 Mar 2025 21:22:53 +0100 Subject: [PATCH] Revert "fixup! test: upgrade to Python 3.11 and Django 4.2" This reverts commit 340d4e04d3386e1e548a62a4ce32b81a30cd0df7. --- requirements/ci.txt | 10 +++++----- requirements/constraints.txt | 6 ++++++ requirements/dev.txt | 20 ++++++++++++-------- requirements/doc.txt | 20 ++++++++++++-------- requirements/quality.txt | 22 ++++++++++++++-------- requirements/test.txt | 21 ++++++++++++++------- 6 files changed, 63 insertions(+), 36 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index 06db503b..df5e2e0d 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -11,15 +11,15 @@ filelock==3.17.0 # tox # virtualenv packaging==24.2 - # via - # pyproject-api - # tox + # via tox platformdirs==4.3.6 # via # tox # virtualenv -pluggy==1.5.0 - # via tox +pluggy==0.13.1 + # via + # -c requirements/constraints.txt + # tox py==1.11.0 # via tox six==1.17.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index d91704bb..2c112072 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,3 +10,9 @@ # Common constraints for edx repos -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + + +# Newer versions of pytest fail because `edx-completion` defines `default_app_config`: +# https://github.com/openedx/completion/blob/v4.2.0/completion/__init__.py#L7 +pytest<6.0.0 +pluggy<1.0.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index e71d436b..a0978b75 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -33,6 +33,7 @@ attrs==25.1.0 # via # -r requirements/quality.txt # openedx-events + # pytest billiard==4.2.1 # via # -r requirements/quality.txt @@ -274,10 +275,6 @@ idna==3.10 # via # -r requirements/quality.txt # requests -iniconfig==2.0.0 - # via - # -r requirements/quality.txt - # pytest isodate==0.7.2 # via # -r requirements/quality.txt @@ -339,7 +336,9 @@ mccabe==0.7.0 mock==3.0.5 # via -r requirements/quality.txt more-itertools==5.0.0 - # via -r requirements/quality.txt + # via + # -r requirements/quality.txt + # pytest mysqlclient==2.2.7 # via -r requirements/quality.txt newrelic==10.6.0 @@ -386,8 +385,9 @@ platformdirs==4.3.6 # -r requirements/quality.txt # pylint # virtualenv -pluggy==1.5.0 +pluggy==0.13.1 # via + # -c requirements/constraints.txt # -r requirements/ci.txt # -r requirements/quality.txt # pytest @@ -407,6 +407,8 @@ psutil==7.0.0 py==1.11.0 # via # -r requirements/ci.txt + # -r requirements/quality.txt + # pytest # tox pycodestyle==2.12.1 # via -r requirements/quality.txt @@ -455,14 +457,15 @@ pyproject-hooks==1.2.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.3.5 +pytest==5.4.3 # via + # -c requirements/constraints.txt # -r requirements/quality.txt # pytest-cov # pytest-django pytest-cov==6.0.0 # via -r requirements/quality.txt -pytest-django==4.10.0 +pytest-django==4.5.2 # via -r requirements/quality.txt python-dateutil==2.9.0.post0 # via @@ -590,6 +593,7 @@ wcwidth==0.2.13 # via # -r requirements/quality.txt # prompt-toolkit + # pytest web-fragments==2.2.0 # via # -r requirements/quality.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 4fb3a65c..3c467d57 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -36,6 +36,7 @@ attrs==25.1.0 # -r requirements/base.txt # -r requirements/test.txt # openedx-events + # pytest babel==2.17.0 # via sphinx billiard==4.2.1 @@ -301,10 +302,6 @@ idna==3.10 # requests imagesize==1.4.1 # via sphinx -iniconfig==2.0.0 - # via - # -r requirements/test.txt - # pytest isodate==0.7.2 # via # -r requirements/base.txt @@ -368,7 +365,9 @@ markupsafe==3.0.2 mock==3.0.5 # via -r requirements/test.txt more-itertools==5.0.0 - # via -r requirements/test.txt + # via + # -r requirements/test.txt + # pytest mysqlclient==2.2.7 # via -r requirements/test.txt newrelic==10.6.0 @@ -411,7 +410,7 @@ pbr==6.1.1 # -r requirements/base.txt # -r requirements/test.txt # stevedore -pluggy==1.5.0 +pluggy==0.13.1 # via # -r requirements/test.txt # pytest @@ -429,6 +428,10 @@ psutil==7.0.0 # -r requirements/base.txt # -r requirements/test.txt # edx-django-utils +py==1.11.0 + # via + # -r requirements/test.txt + # pytest pycparser==2.22 # via # -r requirements/base.txt @@ -456,14 +459,14 @@ pynacl==1.5.0 # -r requirements/base.txt # -r requirements/test.txt # edx-django-utils -pytest==8.3.5 +pytest==5.4.3 # via # -r requirements/test.txt # pytest-cov # pytest-django pytest-cov==6.0.0 # via -r requirements/test.txt -pytest-django==4.10.0 +pytest-django==4.5.2 # via -r requirements/test.txt python-dateutil==2.9.0.post0 # via @@ -613,6 +616,7 @@ wcwidth==0.2.13 # -r requirements/base.txt # -r requirements/test.txt # prompt-toolkit + # pytest web-fragments==2.2.0 # via # -r requirements/base.txt diff --git a/requirements/quality.txt b/requirements/quality.txt index aafc8f8e..3a515adb 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -32,6 +32,7 @@ attrs==25.1.0 # via # -r requirements/test.txt # openedx-events + # pytest billiard==4.2.1 # via # -r requirements/test.txt @@ -254,10 +255,6 @@ idna==3.10 # via # -r requirements/test.txt # requests -iniconfig==2.0.0 - # via - # -r requirements/test.txt - # pytest isodate==0.7.2 # via # -r requirements/test.txt @@ -317,7 +314,9 @@ mccabe==0.7.0 mock==3.0.5 # via -r requirements/test.txt more-itertools==5.0.0 - # via -r requirements/test.txt + # via + # -r requirements/test.txt + # pytest mysqlclient==2.2.7 # via -r requirements/test.txt newrelic==10.6.0 @@ -354,8 +353,9 @@ pbr==6.1.1 # stevedore platformdirs==4.3.6 # via pylint -pluggy==1.5.0 +pluggy==0.13.1 # via + # -c requirements/constraints.txt # -r requirements/test.txt # pytest polib==1.2.0 @@ -370,6 +370,10 @@ psutil==7.0.0 # via # -r requirements/test.txt # edx-django-utils +py==1.11.0 + # via + # -r requirements/test.txt + # pytest pycodestyle==2.12.1 # via -r requirements/quality.in pycparser==2.22 @@ -406,14 +410,15 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==8.3.5 +pytest==5.4.3 # via + # -c requirements/constraints.txt # -r requirements/test.txt # pytest-cov # pytest-django pytest-cov==6.0.0 # via -r requirements/test.txt -pytest-django==4.10.0 +pytest-django==4.5.2 # via -r requirements/test.txt python-dateutil==2.9.0.post0 # via @@ -525,6 +530,7 @@ wcwidth==0.2.13 # via # -r requirements/test.txt # prompt-toolkit + # pytest web-fragments==2.2.0 # via # -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index 577a8d70..47addba2 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -28,6 +28,7 @@ attrs==25.1.0 # via # -r requirements/base.txt # openedx-events + # pytest billiard==4.2.1 # via # -r requirements/base.txt @@ -237,8 +238,6 @@ idna==3.10 # via # -r requirements/base.txt # requests -iniconfig==2.0.0 - # via pytest isodate==0.7.2 # via # -r requirements/base.txt @@ -288,7 +287,9 @@ markupsafe==3.0.2 mock==3.0.5 # via -r requirements/test.in more-itertools==5.0.0 - # via -r requirements/test.in + # via + # -r requirements/test.in + # pytest mysqlclient==2.2.7 # via -r requirements/test.in newrelic==10.6.0 @@ -317,8 +318,10 @@ pbr==6.1.1 # via # -r requirements/base.txt # stevedore -pluggy==1.5.0 - # via pytest +pluggy==0.13.1 + # via + # -c requirements/constraints.txt + # pytest polib==1.2.0 # via edx-i18n-tools prompt-toolkit==3.0.50 @@ -329,6 +332,8 @@ psutil==7.0.0 # via # -r requirements/base.txt # edx-django-utils +py==1.11.0 + # via pytest pycparser==2.22 # via # -r requirements/base.txt @@ -347,14 +352,15 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==8.3.5 +pytest==5.4.3 # via + # -c requirements/constraints.txt # -r requirements/test.in # pytest-cov # pytest-django pytest-cov==6.0.0 # via -r requirements/test.in -pytest-django==4.10.0 +pytest-django==4.5.2 # via -r requirements/test.in python-dateutil==2.9.0.post0 # via @@ -462,6 +468,7 @@ wcwidth==0.2.13 # via # -r requirements/base.txt # prompt-toolkit + # pytest web-fragments==2.2.0 # via # -r requirements/base.txt