From 8eca56e4bdb7507f5080458a2d195876d854e767 Mon Sep 17 00:00:00 2001 From: Nadeem Shahzad Date: Fri, 1 Nov 2024 23:33:39 +0500 Subject: [PATCH] Revert "chore: Upgrade Python requirements" --- .../roles/aws/templates/requirements.txt.j2 | 17 ++--- requirements.txt | 39 ++++++----- requirements/aws.in | 1 - requirements/common_constraints.txt | 14 +--- requirements/jenkins.in | 1 - requirements/pip-tools.txt | 19 ++++-- requirements/pip.txt | 12 ++-- util/elasticsearch/requirements.txt | 6 +- util/jenkins/requirements-cloudflare.txt | 12 ++-- util/jenkins/requirements.txt | 66 +++++++++++-------- util/pingdom/requirements.txt | 14 ++-- util/vpc-tools/requirements.txt | 12 ++-- 12 files changed, 109 insertions(+), 104 deletions(-) diff --git a/playbooks/roles/aws/templates/requirements.txt.j2 b/playbooks/roles/aws/templates/requirements.txt.j2 index ec9d6eb9a49..2b3b3b0edda 100644 --- a/playbooks/roles/aws/templates/requirements.txt.j2 +++ b/playbooks/roles/aws/templates/requirements.txt.j2 @@ -1,21 +1,21 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # -awscli==1.35.19 +awscli==1.32.2 # via -r requirements/aws.in boto==2.49.0 # via -r requirements/aws.in -boto3==1.35.53 +boto3==1.34.2 # via -r requirements/aws.in -botocore==1.35.53 +botocore==1.34.2 # via # awscli # boto3 # s3transfer -colorama==0.4.6 +colorama==0.4.4 # via awscli docutils==0.16 # via awscli @@ -23,9 +23,9 @@ jmespath==1.0.1 # via # boto3 # botocore -pyasn1==0.6.1 +pyasn1==0.5.1 # via rsa -python-dateutil==2.9.0.post0 +python-dateutil==2.8.2 # via # botocore # s3cmd @@ -39,10 +39,11 @@ rsa==4.7.2 # via awscli s3cmd==2.4.0 # via -r requirements/aws.in -s3transfer==0.10.3 +s3transfer==0.9.0 # via # awscli # boto3 six==1.16.0 # via python-dateutil urllib3==1.26.18 + # via botocore diff --git a/requirements.txt b/requirements.txt index ea01dcad963..5293f81318b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -8,7 +8,7 @@ ansible==2.10.7 # via -r requirements/base.in ansible-base==2.10.17 # via ansible -awscli==1.35.19 +awscli==1.32.2 # via -r requirements/base.in bcrypt==3.1.7 # via @@ -16,25 +16,25 @@ bcrypt==3.1.7 # paramiko boto==2.49.0 # via -r requirements/base.in -boto3==1.35.53 +boto3==1.34.2 # via -r requirements/base.in -botocore==1.35.53 +botocore==1.34.2 # via # awscli # boto3 # s3transfer -certifi==2024.8.30 +certifi==2023.11.17 # via requests -cffi==1.17.1 +cffi==1.16.0 # via # bcrypt # cryptography # pynacl -charset-normalizer==3.4.0 +charset-normalizer==3.3.2 # via requests -colorama==0.4.6 +colorama==0.4.4 # via awscli -cryptography==43.0.3 +cryptography==41.0.7 # via # ansible-base # paramiko @@ -50,7 +50,7 @@ docutils==0.16 # via awscli ecdsa==0.13.3 # via -r requirements/base.in -idna==3.10 +idna==3.6 # via requests jinja2==2.8 # via @@ -68,7 +68,7 @@ mysqlclient==1.4.6 # via -r requirements/base.in networkx==1.11 # via -r requirements/base.in -packaging==24.1 +packaging==23.2 # via ansible-base paramiko==2.4.2 # via -r requirements/base.in @@ -76,32 +76,32 @@ pathlib2==2.3.0 # via -r requirements/base.in prettytable==0.7.2 # via -r requirements/base.in -pyasn1==0.6.1 +pyasn1==0.5.1 # via # paramiko # rsa -pycparser==2.22 +pycparser==2.21 # via cffi -pycryptodome==3.21.0 +pycryptodome==3.19.0 # via -r requirements/base.in pymongo==3.9.0 # via -r requirements/base.in pynacl==1.5.0 # via paramiko -python-dateutil==2.9.0.post0 +python-dateutil==2.8.2 # via botocore -pyyaml==6.0.2 +pyyaml==6.0.1 # via # -r requirements/base.in # ansible-base # awscli -requests==2.32.3 +requests==2.31.0 # via # -r requirements/base.in # datadog rsa==4.7.2 # via awscli -s3transfer==0.10.3 +s3transfer==0.9.0 # via # awscli # boto3 @@ -111,3 +111,6 @@ six==1.16.0 # pathlib2 # python-dateutil urllib3==1.26.18 + # via + # botocore + # requests diff --git a/requirements/aws.in b/requirements/aws.in index d6f33d1a891..f76449ccdef 100644 --- a/requirements/aws.in +++ b/requirements/aws.in @@ -6,4 +6,3 @@ boto3 futures ; python_version == "2.7" # via s3transfer s3cmd pyyaml==5.3.1 -urllib3==1.26.18 diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index cadbfbd68ac..15aafb293da 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,23 +13,11 @@ # using LTS django version -Django<5.0 +Django<4.0 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html -# See https://github.com/openedx/edx-platform/issues/35126 for more info elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 - -# Cause: https://github.com/openedx/event-tracking/pull/290 -# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform. -# We will pin event-tracking to do not break existing installations -# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586 -# has been resolved and edx-platform is running with pymongo>=4.4.0 -event-tracking<2.4.1 - -# Cause: https://github.com/openedx/edx-lint/issues/458 -# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved. -pip<24.3 diff --git a/requirements/jenkins.in b/requirements/jenkins.in index 6cb65662d14..0f5728b084b 100644 --- a/requirements/jenkins.in +++ b/requirements/jenkins.in @@ -16,4 +16,3 @@ redis==2.10.6 splunk-sdk==1.6.16 # older versions have been yanked yq jq -urllib3==1.26.18 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index db6c4632290..93a9cee28cb 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,23 +1,30 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # -build==1.2.2.post1 +build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools -packaging==24.1 +importlib-metadata==7.0.0 # via build -pip-tools==7.4.1 +packaging==23.2 + # via build +pip-tools==7.3.0 # via -r requirements/pip-tools.in -pyproject-hooks==1.2.0 +pyproject-hooks==1.0.0 + # via build +tomli==2.0.1 # via # build # pip-tools -wheel==0.44.0 + # pyproject-hooks +wheel==0.42.0 # via pip-tools +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 4996fad1d98..d798b87b36c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,16 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # -wheel==0.44.0 +wheel==0.42.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.2 - # via - # -c requirements/common_constraints.txt - # -r requirements/pip.in -setuptools==75.3.0 +pip==23.3.2 + # via -r requirements/pip.in +setuptools==69.0.2 # via -r requirements/pip.in diff --git a/util/elasticsearch/requirements.txt b/util/elasticsearch/requirements.txt index 6ff7f4c8a67..41dbdaf1fe3 100644 --- a/util/elasticsearch/requirements.txt +++ b/util/elasticsearch/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -8,7 +8,7 @@ deepdiff==3.1.0 # via -r requirements/elasticsearch.in elasticsearch==0.4.5 # via -r requirements/elasticsearch.in -jsonpickle==3.3.0 +jsonpickle==3.0.2 # via deepdiff -urllib3==1.26.20 +urllib3==1.26.18 # via elasticsearch diff --git a/util/jenkins/requirements-cloudflare.txt b/util/jenkins/requirements-cloudflare.txt index 4ffb7829ef6..9419d9fd3d1 100644 --- a/util/jenkins/requirements-cloudflare.txt +++ b/util/jenkins/requirements-cloudflare.txt @@ -1,18 +1,18 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # -certifi==2024.8.30 +certifi==2023.11.17 # via requests -charset-normalizer==3.4.0 +charset-normalizer==3.3.2 # via requests click==8.1.7 # via -r requirements/cloudflare.in -idna==3.10 +idna==3.6 # via requests -requests==2.32.3 +requests==2.31.0 # via -r requirements/cloudflare.in -urllib3==2.2.3 +urllib3==2.1.0 # via requests diff --git a/util/jenkins/requirements.txt b/util/jenkins/requirements.txt index d074c6506fc..4ddf612445b 100644 --- a/util/jenkins/requirements.txt +++ b/util/jenkins/requirements.txt @@ -1,35 +1,39 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # amqp==5.2.0 # via kombu -argcomplete==3.5.1 +argcomplete==3.2.1 # via yq -awscli==1.35.19 +awscli==1.32.2 # via -r requirements/jenkins.in backoff==1.4.3 # via -r requirements/jenkins.in -billiard==4.2.1 +backports-zoneinfo[tzdata]==0.2.1 + # via + # celery + # kombu +billiard==4.2.0 # via celery boto==2.49.0 # via -r requirements/jenkins.in -boto3==1.35.53 +boto3==1.34.2 # via -r requirements/jenkins.in -botocore==1.35.53 +botocore==1.34.2 # via # awscli # boto3 # s3transfer -celery==5.4.0 +celery==5.3.6 # via -r requirements/jenkins.in -certifi==2024.8.30 +certifi==2023.11.17 # via # opsgenie-sdk # requests -charset-normalizer==3.4.0 +charset-normalizer==3.3.2 # via requests click==8.1.7 # via @@ -38,60 +42,60 @@ click==8.1.7 # click-didyoumean # click-plugins # click-repl -click-didyoumean==0.3.1 +click-didyoumean==0.3.0 # via celery click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -colorama==0.4.6 +colorama==0.4.4 # via awscli docutils==0.16 # via awscli -idna==3.10 +idna==3.6 # via requests jmespath==1.0.1 # via # boto3 # botocore -jq==1.8.0 +jq==1.6.0 # via -r requirements/jenkins.in -kombu==5.4.2 +kombu==5.3.4 # via celery opsgenie-sdk==0.3.1 # via -r requirements/jenkins.in -prompt-toolkit==3.0.48 +prompt-toolkit==3.0.43 # via click-repl -pyasn1==0.6.1 +pyasn1==0.5.1 # via rsa pymysql==0.9.3 # via -r requirements/jenkins.in -python-dateutil==2.9.0.post0 +python-dateutil==2.8.2 # via # botocore # celery # opsgenie-sdk # s3cmd -python-gnupg==0.5.3 +python-gnupg==0.5.2 # via -r requirements/jenkins.in python-magic==0.4.27 # via s3cmd -pytz==2024.2 +pytz==2023.3.post1 # via opsgenie-sdk -pyyaml==6.0.2 +pyyaml==6.0.1 # via # -r requirements/jenkins.in # awscli # yq redis==2.10.6 # via -r requirements/jenkins.in -requests==2.32.3 +requests==2.31.0 # via opsgenie-sdk rsa==4.7.2 # via awscli s3cmd==2.4.0 # via -r requirements/jenkins.in -s3transfer==0.10.3 +s3transfer==0.9.0 # via # awscli # boto3 @@ -101,23 +105,29 @@ six==1.16.0 # python-dateutil splunk-sdk==1.6.16 # via -r requirements/jenkins.in -tomlkit==0.13.2 +tomlkit==0.12.3 # via yq -tzdata==2024.2 +typing-extensions==4.9.0 + # via kombu +tzdata==2023.3 # via + # backports-zoneinfo # celery - # kombu urllib3==1.26.18 + # via + # botocore + # opsgenie-sdk + # requests vine==5.1.0 # via # amqp # celery # kombu -wcwidth==0.2.13 +wcwidth==0.2.12 # via prompt-toolkit -xmltodict==0.14.2 +xmltodict==0.13.0 # via yq -yq==3.4.3 +yq==3.2.3 # via -r requirements/jenkins.in # The following packages are considered to be unsafe in a requirements file: diff --git a/util/pingdom/requirements.txt b/util/pingdom/requirements.txt index 112001f021d..3e9b2a4bbba 100644 --- a/util/pingdom/requirements.txt +++ b/util/pingdom/requirements.txt @@ -1,22 +1,22 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # -certifi==2024.8.30 +certifi==2023.11.17 # via requests -charset-normalizer==3.4.0 +charset-normalizer==3.3.2 # via requests click==6.7 # via -r requirements/pingdom.in -idna==3.10 +idna==3.6 # via requests -pyyaml==6.0.2 +pyyaml==6.0.1 # via -r requirements/pingdom.in -requests==2.32.3 +requests==2.31.0 # via -r requirements/pingdom.in six==1.14.0 # via -r requirements/pingdom.in -urllib3==2.2.3 +urllib3==2.1.0 # via requests diff --git a/util/vpc-tools/requirements.txt b/util/vpc-tools/requirements.txt index 2864e9dd1a5..a966598293d 100644 --- a/util/vpc-tools/requirements.txt +++ b/util/vpc-tools/requirements.txt @@ -1,20 +1,20 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade # boto==2.49.0 # via -r requirements/vpc-tools.in -certifi==2024.8.30 +certifi==2023.11.17 # via requests -charset-normalizer==3.4.0 +charset-normalizer==3.3.2 # via requests docopt==0.6.2 # via -r requirements/vpc-tools.in -idna==3.10 +idna==3.6 # via requests -requests==2.32.3 +requests==2.31.0 # via -r requirements/vpc-tools.in -urllib3==2.2.3 +urllib3==2.1.0 # via requests