Skip to content

Commit

Permalink
Merge pull request #441 from openedx/jenkins/upgrade-python-requireme…
Browse files Browse the repository at this point in the history
…nts-fe601a2

Python Requirements Update
  • Loading branch information
pwnage101 authored Apr 9, 2024
2 parents fe601a2 + bb5f57d commit 60cb951
Show file tree
Hide file tree
Showing 10 changed files with 214 additions and 171 deletions.
44 changes: 22 additions & 22 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,26 @@
#
amqp==5.2.0
# via kombu
asgiref==3.7.2
asgiref==3.8.1
# via django
asn1crypto==1.5.1
# via snowflake-connector-python
awscli==1.32.56
awscli==1.32.80
# via -r requirements/reporting.in
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# celery
# django
# djangorestframework
# kombu
bcrypt==4.1.2
# via paramiko
billiard==4.2.0
# via celery
boto3==1.34.56
boto3==1.34.80
# via -r requirements/reporting.in
botocore==1.34.56
botocore==1.34.80
# via
# awscli
# boto3
Expand Down Expand Up @@ -52,7 +53,7 @@ click==8.1.7
# click-plugins
# click-repl
# edx-django-utils
click-didyoumean==0.3.0
click-didyoumean==0.3.1
# via celery
click-plugins==1.1.1
# via celery
Expand Down Expand Up @@ -89,17 +90,17 @@ django-crum==0.7.9
# edx-rbac
django-fernet-fields-v2==0.9
# via -r requirements/base.in
django-filter==23.5
django-filter==24.2
# via -r requirements/base.in
django-model-utils==4.4.0
django-model-utils==4.5.0
# via
# -r requirements/base.in
# edx-rbac
django-waffle==4.1.0
# via
# edx-django-utils
# edx-drf-extensions
djangorestframework==3.14.0
djangorestframework==3.15.1
# via
# djangorestframework-csv
# drf-jwt
Expand All @@ -110,12 +111,12 @@ docutils==0.16
# via awscli
drf-jwt==1.19.2
# via edx-drf-extensions
edx-django-utils==5.10.1
edx-django-utils==5.12.0
# via
# -r requirements/base.in
# edx-drf-extensions
# edx-rest-api-client
edx-drf-extensions==10.2.0
edx-drf-extensions==10.3.0
# via
# -r requirements/base.in
# edx-rbac
Expand All @@ -125,13 +126,13 @@ edx-opaque-keys==2.5.1
# edx-drf-extensions
edx-rbac==1.8.0
# via -r requirements/base.in
edx-rest-api-client==5.6.1
edx-rest-api-client==5.7.0
# via -r requirements/base.in
factory-boy==3.3.0
# via -r requirements/base.in
faker==24.0.0
faker==24.7.1
# via factory-boy
filelock==3.13.1
filelock==3.13.3
# via snowflake-connector-python
idna==3.6
# via
Expand All @@ -143,13 +144,13 @@ jmespath==1.0.1
# via
# boto3
# botocore
kombu==5.3.5
kombu==5.3.6
# via celery
monotonic==1.6
# via py2neo
newrelic==9.7.0
newrelic==9.8.0
# via edx-django-utils
packaging==23.2
packaging==24.0
# via
# py2neo
# snowflake-connector-python
Expand All @@ -169,11 +170,11 @@ psutil==5.9.8
# via edx-django-utils
py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
# via -r requirements/reporting.in
pyasn1==0.5.1
pyasn1==0.6.0
# via
# pgpy
# rsa
pycparser==2.21
pycparser==2.22
# via cffi
pygments==2.17.2
# via py2neo
Expand All @@ -191,7 +192,7 @@ pynacl==1.5.0
# via
# edx-django-utils
# paramiko
pyopenssl==24.0.0
pyopenssl==24.1.0
# via snowflake-connector-python
python-dateutil==2.9.0.post0
# via
Expand All @@ -201,7 +202,6 @@ python-dateutil==2.9.0.post0
# vertica-python
pytz==2024.1
# via
# djangorestframework
# interchange
# snowflake-connector-python
pyyaml==6.0.1
Expand All @@ -217,7 +217,7 @@ rsa==4.7.2
# via awscli
rules==3.3
# via -r requirements/base.in
s3transfer==0.10.0
s3transfer==0.10.1
# via
# awscli
# boto3
Expand Down Expand Up @@ -245,7 +245,7 @@ stevedore==5.2.0
# edx-opaque-keys
tomlkit==0.12.4
# via snowflake-connector-python
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# asgiref
# edx-opaque-keys
Expand Down
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
coverage==7.4.3
coverage==7.4.4
# via -r requirements/ci.in
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.13.3
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
Expand All @@ -34,7 +34,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.14.0
tox==4.14.2
# via -r requirements/ci.in
virtualenv==20.25.1
# via tox
9 changes: 9 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,12 @@ 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

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
Loading

0 comments on commit 60cb951

Please sign in to comment.