From cccbfa46dc7a03ad94d1dbd4b732ea630897bf94 Mon Sep 17 00:00:00 2001 From: Andres Felipe Giraldo Malagon Date: Tue, 28 Jan 2025 18:00:27 -0500 Subject: [PATCH 1/2] build: unpin click --- requirements/constraints.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 9dff568f5f1..9e170de82c9 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -26,11 +26,6 @@ algoliasearch<4.0.0 # Issue for unpinning: https://github.com/openedx/edx-platform/issues/35280 celery>=5.2.2,<6.0.0 -# Date: 2021-05-17 -# greater version breaking upgrade builds -# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35279 -click==8.1.6 - # Date: 2022-07-20 # edx-enterprise, snowflake-connector-python require charset-normalizer==2.0.0 # Can be removed once snowflake-connector-python>2.7.9 is released with the fix. From 56334a7445f6b38de879590e7425cbad18101d86 Mon Sep 17 00:00:00 2001 From: Andres Felipe Giraldo Malagon Date: Tue, 28 Jan 2025 18:01:04 -0500 Subject: [PATCH 2/2] chore: run make upgrade-package with click --- requirements/edx-sandbox/base.txt | 6 ++---- requirements/edx/assets.txt | 6 ++---- requirements/edx/base.txt | 3 +-- requirements/edx/development.txt | 3 +-- requirements/edx/doc.txt | 3 +-- requirements/edx/semgrep.txt | 3 +-- requirements/edx/testing.txt | 3 +-- requirements/pip-tools.txt | 6 ++---- scripts/structures_pruning/requirements/base.txt | 3 +-- scripts/structures_pruning/requirements/testing.txt | 2 +- scripts/user_retirement/requirements/base.txt | 3 +-- scripts/user_retirement/requirements/testing.txt | 2 +- 12 files changed, 15 insertions(+), 28 deletions(-) diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 821664fe9fc..b93e1ddb9fb 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -8,10 +8,8 @@ cffi==1.17.1 # via cryptography chem==1.3.0 # via -r requirements/edx-sandbox/base.in -click==8.1.6 - # via - # -c requirements/edx-sandbox/../constraints.txt - # nltk +click==8.1.8 + # via nltk codejail-includes==1.0.0 # via -r requirements/edx-sandbox/base.in contourpy==1.3.1 diff --git a/requirements/edx/assets.txt b/requirements/edx/assets.txt index 15c38017919..ca79e26afe2 100644 --- a/requirements/edx/assets.txt +++ b/requirements/edx/assets.txt @@ -4,10 +4,8 @@ # # make upgrade # -click==8.1.6 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/assets.in +click==8.1.8 + # via -r requirements/edx/assets.in libsass==0.10.0 # via # -c requirements/edx/../constraints.txt diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 94adfa2ac34..21036ede23d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -121,9 +121,8 @@ charset-normalizer==2.0.12 # snowflake-connector-python chem==1.3.0 # via -r requirements/edx/kernel.in -click==8.1.6 +click==8.1.8 # via - # -c requirements/edx/../constraints.txt # celery # click-didyoumean # click-plugins diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 7756011f2bf..041ebfb9cb8 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -226,9 +226,8 @@ chem==1.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -click==8.1.6 +click==8.1.8 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/../pip-tools.txt # -r requirements/edx/assets.txt # -r requirements/edx/development.in diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 2668b35deb3..5bcfe5416b4 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -165,9 +165,8 @@ charset-normalizer==2.0.12 # snowflake-connector-python chem==1.3.0 # via -r requirements/edx/base.txt -click==8.1.6 +click==8.1.8 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # celery # click-didyoumean diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index 9d25000148f..c4e2a8748f3 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -23,9 +23,8 @@ charset-normalizer==2.0.12 # via # -c requirements/edx/../constraints.txt # requests -click==8.1.6 +click==8.1.8 # via - # -c requirements/edx/../constraints.txt # click-option-group # semgrep click-option-group==0.5.6 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 09f61de3745..92786438d58 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -168,9 +168,8 @@ charset-normalizer==2.0.12 # snowflake-connector-python chem==1.3.0 # via -r requirements/edx/base.txt -click==8.1.6 +click==8.1.8 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # celery # click-didyoumean diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index c5a5c5b6fea..5461e4357ec 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,10 +6,8 @@ # build==1.2.2.post1 # via pip-tools -click==8.1.6 - # via - # -c requirements/constraints.txt - # pip-tools +click==8.1.8 + # via pip-tools packaging==24.2 # via build pip-tools==7.4.1 diff --git a/scripts/structures_pruning/requirements/base.txt b/scripts/structures_pruning/requirements/base.txt index b15cb81f29e..eedbeff10b3 100644 --- a/scripts/structures_pruning/requirements/base.txt +++ b/scripts/structures_pruning/requirements/base.txt @@ -4,9 +4,8 @@ # # make upgrade # -click==8.1.6 +click==8.1.8 # via - # -c scripts/structures_pruning/requirements/../../../requirements/constraints.txt # -r scripts/structures_pruning/requirements/base.in # click-log click-log==0.4.0 diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt index e121a05143f..feaea9a5958 100644 --- a/scripts/structures_pruning/requirements/testing.txt +++ b/scripts/structures_pruning/requirements/testing.txt @@ -4,7 +4,7 @@ # # make upgrade # -click==8.1.6 +click==8.1.8 # via # -r scripts/structures_pruning/requirements/base.txt # click-log diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 35cf225d6b1..af67a37ae0f 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -28,9 +28,8 @@ charset-normalizer==2.0.12 # via # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # requests -click==8.1.6 +click==8.1.8 # via - # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # -r scripts/user_retirement/requirements/base.in # edx-django-utils cryptography==44.0.0 diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index 4f13157aee0..67ca3e8ded3 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -41,7 +41,7 @@ charset-normalizer==2.0.12 # via # -r scripts/user_retirement/requirements/base.txt # requests -click==8.1.6 +click==8.1.8 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils