From 734a5508ee3558c6322bb61ab4094d40adcb7bca Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Fri, 26 Apr 2024 21:15:51 +0500 Subject: [PATCH] fix: fix constraints path (#34638) --- requirements/constraints.txt | 4 ---- requirements/edx-sandbox/base.txt | 3 +-- requirements/edx/base.txt | 1 - requirements/edx/development.txt | 1 - requirements/edx/doc.txt | 1 - requirements/edx/testing.txt | 1 - .../structures_pruning/requirements/base.txt | 4 +++- .../requirements/testing.txt | 2 +- scripts/user_retirement/requirements/base.txt | 18 +++++++++++++----- .../user_retirement/requirements/testing.txt | 6 +++--- scripts/xblock/requirements.in | 2 +- scripts/xblock/requirements.txt | 12 ++++++++---- 12 files changed, 30 insertions(+), 25 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 14714000d7..552c91f77c 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -119,10 +119,6 @@ openai<=0.28.1 # https://github.com/openedx/edx-platform/issues/34103 optimizely-sdk<5.0 -# lxml 5.1.0 introduced a breaking change in unit test shards -# This constraint can probably be removed once lxml==5.1.1 is released on PyPI -lxml<5.0 - # xmlsec==1.3.14 breaking tests for all builds, can be removed once a fix is available xmlsec<1.3.14 diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 53c7960778..ac73dc3fca 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -30,9 +30,8 @@ joblib==1.3.2 # via nltk kiwisolver==1.4.5 # via matplotlib -lxml==4.9.4 +lxml==5.2.1 # via - # -c requirements/edx-sandbox/../constraints.txt # -r requirements/edx-sandbox/base.in # openedx-calc markupsafe==2.1.5 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 08008f51b3..cf2b41fcb5 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -682,7 +682,6 @@ lti-consumer-xblock==9.10.0 # via -r requirements/edx/kernel.in lxml==4.9.4 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in # edx-i18n-tools # edxval diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index f02192e914..29dc7e1ad8 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1135,7 +1135,6 @@ lti-consumer-xblock==9.10.0 # -r requirements/edx/testing.txt lxml==4.9.4 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-i18n-tools diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index fb3b487a81..a132000f97 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -805,7 +805,6 @@ lti-consumer-xblock==9.10.0 # via -r requirements/edx/base.txt lxml==4.9.4 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-i18n-tools # edxval diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 566bacd6af..2b31635cc5 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -858,7 +858,6 @@ lti-consumer-xblock==9.10.0 # via -r requirements/edx/base.txt lxml==4.9.4 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-i18n-tools # edxval diff --git a/scripts/structures_pruning/requirements/base.txt b/scripts/structures_pruning/requirements/base.txt index 52e37de32b..1f6d52e8c3 100644 --- a/scripts/structures_pruning/requirements/base.txt +++ b/scripts/structures_pruning/requirements/base.txt @@ -4,8 +4,9 @@ # # make upgrade # -click==8.1.7 +click==8.1.6 # via + # -c scripts/structures_pruning/requirements/../../../requirements/constraints.txt # -r scripts/structures_pruning/requirements/base.in # click-log click-log==0.4.0 @@ -16,6 +17,7 @@ pbr==6.0.0 # via stevedore pymongo==3.13.0 # via + # -c scripts/structures_pruning/requirements/../../../requirements/constraints.txt # -r scripts/structures_pruning/requirements/base.in # edx-opaque-keys stevedore==5.2.0 diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt index e8b9d3bd78..0fc423b1b3 100644 --- a/scripts/structures_pruning/requirements/testing.txt +++ b/scripts/structures_pruning/requirements/testing.txt @@ -4,7 +4,7 @@ # # make upgrade # -click==8.1.7 +click==8.1.6 # 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 11374b34a4..1adc428d5a 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -28,16 +28,23 @@ cffi==1.16.0 # via # cryptography # pynacl -charset-normalizer==3.3.2 - # via requests -click==8.1.7 +charset-normalizer==2.0.12 # via + # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt + # requests +click==8.1.6 + # via + # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # -r scripts/user_retirement/requirements/base.in # edx-django-utils -cryptography==42.0.0 - # via simple-salesforce +cryptography==38.0.4 + # via + # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt + # simple-salesforce django==4.2.9 # via + # -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt + # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # django-crum # django-waffle # edx-django-utils @@ -170,6 +177,7 @@ uritemplate==4.1.1 # via google-api-python-client urllib3==1.26.18 # via + # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # botocore # requests zeep==4.2.1 diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index 4517a31633..b61e49596e 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -42,15 +42,15 @@ cffi==1.16.0 # -r scripts/user_retirement/requirements/base.txt # cryptography # pynacl -charset-normalizer==3.3.2 +charset-normalizer==2.0.12 # via # -r scripts/user_retirement/requirements/base.txt # requests -click==8.1.7 +click==8.1.6 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -cryptography==42.0.0 +cryptography==38.0.4 # via # -r scripts/user_retirement/requirements/base.txt # moto diff --git a/scripts/xblock/requirements.in b/scripts/xblock/requirements.in index 0a6e461e37..f21789405d 100644 --- a/scripts/xblock/requirements.in +++ b/scripts/xblock/requirements.in @@ -1,3 +1,3 @@ --c ../../../requirements/constraints.txt +-c ../../requirements/constraints.txt requests diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 6f0ae247c9..7a5f64224c 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -6,11 +6,15 @@ # certifi==2024.2.2 # via requests -charset-normalizer==3.3.2 - # via requests +charset-normalizer==2.0.12 + # via + # -c scripts/xblock/../../requirements/constraints.txt + # requests idna==3.6 # via requests requests==2.31.0 # via -r scripts/xblock/requirements.in -urllib3==2.2.1 - # via requests +urllib3==1.26.18 + # via + # -c scripts/xblock/../../requirements/constraints.txt + # requests