From eb069d7677726166f975884d505a4c804f40618c Mon Sep 17 00:00:00 2001 From: magajh Date: Mon, 11 Dec 2023 12:55:20 -0500 Subject: [PATCH 1/2] chore: upgrade Django to 4.2.8 --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index c439cdae0422..52d8b2224607 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -181,7 +181,7 @@ defusedxml==0.7.1 # social-auth-core deprecated==1.2.14 # via jwcrypto -django==4.2.6 +django==4.2.8 # via # -r requirements/edx/kernel.in # django-appconf diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 121855ae45cf..8dfee3f5c769 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -343,7 +343,7 @@ distlib==0.3.7 # via # -r requirements/edx/testing.txt # virtualenv -django==4.2.6 +django==4.2.8 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 1e37ede6d68e..603915ecf4ab 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -230,7 +230,7 @@ deprecated==1.2.14 # via # -r requirements/edx/base.txt # jwcrypto -django==4.2.6 +django==4.2.8 # via # -r requirements/edx/base.txt # django-appconf diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 2ab577f31d91..28da825c13c2 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -263,7 +263,7 @@ dill==0.3.7 # via pylint distlib==0.3.7 # via virtualenv -django==4.2.6 +django==4.2.8 # via # -r requirements/edx/base.txt # django-appconf From aec3dec310f3d7c60076368dc6945de2b8057e47 Mon Sep 17 00:00:00 2001 From: magajh Date: Mon, 11 Dec 2023 13:05:46 -0500 Subject: [PATCH 2/2] chore: compile requirements --- requirements/common_constraints.txt | 4 ---- requirements/edx/development.txt | 1 - requirements/edx/testing.txt | 1 - 3 files changed, 6 deletions(-) diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index a0d4097134f6..7313473a1675 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -24,7 +24,3 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected - -# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. -# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 -tox<4.0.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 8dfee3f5c769..1827527d0e5c 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -2053,7 +2053,6 @@ tomlkit==0.12.1 # snowflake-connector-python tox==3.28.0 # via - # -c requirements/edx/../common_constraints.txt # -r requirements/edx/testing.txt # tox-battery tox-battery==0.6.2 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 28da825c13c2..6640fb31d5b2 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1514,7 +1514,6 @@ tomlkit==0.12.1 # snowflake-connector-python tox==3.28.0 # via - # -c requirements/edx/../common_constraints.txt # -r requirements/edx/testing.in # tox-battery tox-battery==0.6.2