From 5436511dd613094a6cebc22b24bd34b7e7388df1 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 27 Jul 2023 13:11:29 +0500 Subject: [PATCH 1/8] fix: include new assets.txt file in make upgrade --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 1efa916edb21..7bcee3eddcb3 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,7 @@ REQ_FILES = \ requirements/edx/doc \ requirements/edx/testing \ requirements/edx/development \ + requirements/edx/assets \ scripts/xblock/requirements define COMMON_CONSTRAINTS_TEMP_COMMENT From ddaf1f10e34705a088f99f8ec9bde8e99e57bf7d Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 27 Jul 2023 13:25:29 +0500 Subject: [PATCH 2/8] test: update click version to resolve upgrade job failure --- requirements/edx/assets.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/assets.txt b/requirements/edx/assets.txt index 5a6ac1af386d..bcac144e0edb 100644 --- a/requirements/edx/assets.txt +++ b/requirements/edx/assets.txt @@ -4,7 +4,7 @@ # # make upgrade # -click==8.1.5 +click==8.1.6 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/assets.in From ad03f515fd07fa635c26955f70bac17f9bd3e343 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Thu, 27 Jul 2023 04:37:14 -0400 Subject: [PATCH 3/8] chore: Updating Python Requirements (#32861) --- requirements/edx/base.txt | 11 ++++++----- requirements/edx/development.txt | 17 +++++++++-------- requirements/edx/doc.txt | 13 +++++++------ requirements/edx/testing.txt | 17 +++++++++-------- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b6ddfb995cb4..caec2d543364 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -201,6 +201,7 @@ django==3.2.20 # django-statici18n # django-storages # django-user-tasks + # django-waffle # djangorestframework # done-xblock # drf-jwt @@ -362,7 +363,7 @@ django-storages==1.9.1 # edxval django-user-tasks==3.1.0 # via -r requirements/edx/kernel.in -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/edx/kernel.in # edx-django-utils @@ -429,22 +430,22 @@ edx-auth-backends==4.1.0 # openedx-blockstore edx-braze-client==0.1.7 # via -r requirements/edx/bundled.in -edx-bulk-grades==1.0.1 +edx-bulk-grades==1.0.2 # via # -r requirements/edx/kernel.in # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/kernel.in -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/edx/kernel.in # edx-name-affirmation # super-csv edx-codejail==3.3.3 # via -r requirements/edx/kernel.in -edx-completion==4.2.1 +edx-completion==4.3.0 # via -r requirements/edx/kernel.in -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via # -r requirements/edx/kernel.in # edxval diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 193c48a7db76..cf4334c56e27 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -362,6 +362,7 @@ django==3.2.20 # django-stubs # django-stubs-ext # django-user-tasks + # django-waffle # djangorestframework # done-xblock # drf-jwt @@ -586,7 +587,7 @@ django-user-tasks==3.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -687,7 +688,7 @@ edx-braze-client==0.1.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-bulk-grades==1.0.1 +edx-bulk-grades==1.0.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -696,7 +697,7 @@ edx-ccx-keys==1.2.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -706,11 +707,11 @@ edx-codejail==3.3.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-completion==4.2.1 +edx-completion==4.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1461,11 +1462,11 @@ pycryptodomex==3.18.0 # lti-consumer-xblock # pyjwkest # snowflake-connector-python -pydantic==2.0.3 +pydantic==2.1.1 # via # -r requirements/edx/testing.txt # fastapi -pydantic-core==2.3.0 +pydantic-core==2.4.0 # via # -r requirements/edx/testing.txt # pydantic @@ -2023,7 +2024,7 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.0 # via # -r requirements/edx/testing.txt # pylint diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index ee49e04cee4f..49f111ca4ad7 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -249,6 +249,7 @@ django==3.2.20 # django-statici18n # django-storages # django-user-tasks + # django-waffle # djangorestframework # done-xblock # drf-jwt @@ -426,7 +427,7 @@ django-storages==1.9.1 # edxval django-user-tasks==3.1.0 # via -r requirements/edx/base.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -506,22 +507,22 @@ edx-auth-backends==4.1.0 # openedx-blockstore edx-braze-client==0.1.7 # via -r requirements/edx/base.txt -edx-bulk-grades==1.0.1 +edx-bulk-grades==1.0.2 # via # -r requirements/edx/base.txt # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/base.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/edx/base.txt # edx-name-affirmation # super-csv edx-codejail==3.3.3 # via -r requirements/edx/base.txt -edx-completion==4.2.1 +edx-completion==4.3.0 # via -r requirements/edx/base.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via # -r requirements/edx/base.txt # edxval @@ -555,7 +556,7 @@ edx-drf-extensions==8.8.0 # edx-rbac # edx-when # edxval -edx-enterprise==4.0.4 +edx-enterprise==4.0.5 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 6aedfcac9754..bac76b53bfdf 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -281,6 +281,7 @@ django==3.2.20 # django-statici18n # django-storages # django-user-tasks + # django-waffle # djangorestframework # done-xblock # drf-jwt @@ -458,7 +459,7 @@ django-storages==1.9.1 # edxval django-user-tasks==3.1.0 # via -r requirements/edx/base.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -535,22 +536,22 @@ edx-auth-backends==4.1.0 # openedx-blockstore edx-braze-client==0.1.7 # via -r requirements/edx/base.txt -edx-bulk-grades==1.0.1 +edx-bulk-grades==1.0.2 # via # -r requirements/edx/base.txt # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/base.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/edx/base.txt # edx-name-affirmation # super-csv edx-codejail==3.3.3 # via -r requirements/edx/base.txt -edx-completion==4.2.1 +edx-completion==4.3.0 # via -r requirements/edx/base.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via # -r requirements/edx/base.txt # edxval @@ -1097,9 +1098,9 @@ pycryptodomex==3.18.0 # lti-consumer-xblock # pyjwkest # snowflake-connector-python -pydantic==2.0.3 +pydantic==2.1.1 # via fastapi -pydantic-core==2.3.0 +pydantic-core==2.4.0 # via pydantic pygments==2.15.1 # via @@ -1490,7 +1491,7 @@ tomli==2.0.1 # pylint # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.0 # via pylint tox==3.28.0 # via From 48e907e26744455719b34f27fd566d0f2b8b22c6 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 27 Jul 2023 13:49:52 +0500 Subject: [PATCH 4/8] chore: Removed one package --- requirements/edx/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index caec2d543364..24c048b8579d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -436,7 +436,7 @@ edx-bulk-grades==1.0.2 # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/kernel.in -edx-celeryutils==1.2.3 +edx-celeryutils==1.2.2 # via # -r requirements/edx/kernel.in # edx-name-affirmation From d957231289ea08576d52425a705ea619deccc99e Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 27 Jul 2023 13:51:11 +0500 Subject: [PATCH 5/8] chore: Removed package --- requirements/edx/development.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index cf4334c56e27..890219866826 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -697,7 +697,7 @@ edx-ccx-keys==1.2.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-celeryutils==1.2.3 +edx-celeryutils==1.2.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt From 883f47206157bc4f357be17d78b72ef97f5d4db5 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 27 Jul 2023 13:51:57 +0500 Subject: [PATCH 6/8] chore: Removed package --- requirements/edx/doc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 49f111ca4ad7..4631702bf919 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -513,7 +513,7 @@ edx-bulk-grades==1.0.2 # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/base.txt -edx-celeryutils==1.2.3 +edx-celeryutils==1.2.2 # via # -r requirements/edx/base.txt # edx-name-affirmation From fbc852cea784000fd3ec07404d527ce7151e7222 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 27 Jul 2023 13:52:41 +0500 Subject: [PATCH 7/8] chore: Update testing.txt --- requirements/edx/testing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index bac76b53bfdf..7b4a712ea985 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -542,7 +542,7 @@ edx-bulk-grades==1.0.2 # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/base.txt -edx-celeryutils==1.2.3 +edx-celeryutils==1.2.2 # via # -r requirements/edx/base.txt # edx-name-affirmation From f48e3bbdcc65a467a672320436dcf8210a39e323 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 27 Jul 2023 13:56:33 +0500 Subject: [PATCH 8/8] chore: fixing some packages. --- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 4 ++-- requirements/edx/doc.txt | 4 ++-- requirements/edx/testing.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 24c048b8579d..79b59d81e3ad 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -436,7 +436,7 @@ edx-bulk-grades==1.0.2 # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/kernel.in -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/edx/kernel.in # edx-name-affirmation @@ -445,7 +445,7 @@ edx-codejail==3.3.3 # via -r requirements/edx/kernel.in edx-completion==4.3.0 # via -r requirements/edx/kernel.in -edx-django-release-util==1.3.0 +edx-django-release-util==1.2.0 # via # -r requirements/edx/kernel.in # edxval diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 890219866826..dee5a27b2818 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -697,7 +697,7 @@ edx-ccx-keys==1.2.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -711,7 +711,7 @@ edx-completion==4.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-django-release-util==1.3.0 +edx-django-release-util==1.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 4631702bf919..84f2aa878fd6 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -513,7 +513,7 @@ edx-bulk-grades==1.0.2 # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/base.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/edx/base.txt # edx-name-affirmation @@ -522,7 +522,7 @@ edx-codejail==3.3.3 # via -r requirements/edx/base.txt edx-completion==4.3.0 # via -r requirements/edx/base.txt -edx-django-release-util==1.3.0 +edx-django-release-util==1.2.0 # via # -r requirements/edx/base.txt # edxval diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 7b4a712ea985..736f6fa45125 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -542,7 +542,7 @@ edx-bulk-grades==1.0.2 # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/base.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/edx/base.txt # edx-name-affirmation @@ -551,7 +551,7 @@ edx-codejail==3.3.3 # via -r requirements/edx/base.txt edx-completion==4.3.0 # via -r requirements/edx/base.txt -edx-django-release-util==1.3.0 +edx-django-release-util==1.2.0 # via # -r requirements/edx/base.txt # edxval