Skip to content

Commit

Permalink
Merge pull request #94 from edx/revert-92-repo-tools/upgrade-python-r…
Browse files Browse the repository at this point in the history
…equirements-098cf61

Revert "chore: Upgrade Python requirements"
  • Loading branch information
nadeemshahzad authored Nov 1, 2024
2 parents c459f8b + 8eca56e commit 073b8a4
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 104 deletions.
17 changes: 9 additions & 8 deletions playbooks/roles/aws/templates/requirements.txt.j2
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
#
# 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
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
Expand All @@ -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
39 changes: 21 additions & 18 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -8,33 +8,33 @@ 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
# -c requirements/constraints.txt
# 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
Expand All @@ -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
Expand All @@ -68,40 +68,40 @@ 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
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
Expand All @@ -111,3 +111,6 @@ six==1.16.0
# pathlib2
# python-dateutil
urllib3==1.26.18
# via
# botocore
# requests
1 change: 0 additions & 1 deletion requirements/aws.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ boto3
futures ; python_version == "2.7" # via s3transfer
s3cmd
pyyaml==5.3.1
urllib3==1.26.18
14 changes: 1 addition & 13 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion requirements/jenkins.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ redis==2.10.6
splunk-sdk==1.6.16 # older versions have been yanked
yq
jq
urllib3==1.26.18
19 changes: 13 additions & 6 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 5 additions & 7 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions util/elasticsearch/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
12 changes: 6 additions & 6 deletions util/jenkins/requirements-cloudflare.txt
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 073b8a4

Please sign in to comment.