Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
mumarkhan999 authored Apr 2, 2024
2 parents 3b1ab3e + 707851f commit 13a032b
Show file tree
Hide file tree
Showing 10 changed files with 348 additions and 343 deletions.
76 changes: 38 additions & 38 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ amqp==5.2.0
# via kombu
analytics-python==1.4.post1
# via -r requirements/base.in
asgiref==3.7.2
asgiref==3.8.1
# via
# django
# django-cors-headers
# django-simple-history
async-timeout==4.0.3
# via redis
attrs==23.2.0
Expand All @@ -26,12 +27,13 @@ backports-zoneinfo[tzdata]==0.2.1
# via
# celery
# django
# djangorestframework
# kombu
billiard==4.2.0
# via celery
boto3==1.34.32
boto3==1.34.74
# via django-ses
botocore==1.34.32
botocore==1.34.74
# via
# boto3
# s3transfer
Expand All @@ -40,7 +42,7 @@ celery==5.3.6
# -r requirements/base.in
# django-celery-results
# edx-celeryutils
certifi==2023.11.17
certifi==2024.2.2
# via requests
cffi==1.16.0
# via
Expand All @@ -56,24 +58,25 @@ click==8.1.7
# click-repl
# code-annotations
# edx-django-utils
click-didyoumean==0.3.0
click-didyoumean==0.3.1
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
code-annotations==1.6.0
code-annotations==1.7.0
# via edx-toggles
cryptography==42.0.2
cryptography==42.0.5
# via
# pyjwt
# social-auth-core
defusedxml==0.8.0rc2
# via
# python3-openid
# social-auth-core
django==4.2.9
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-autocomplete-light
Expand All @@ -99,7 +102,7 @@ django==4.2.9
# edx-toggles
# jsonfield
# social-auth-app-django
django-autocomplete-light==3.9.7
django-autocomplete-light==3.11.0
# via -r requirements/base.in
django-celery-results==2.5.1
# via -r requirements/base.in
Expand All @@ -114,18 +117,18 @@ django-durationwidget==1.0.5
# via -r requirements/base.in
django-extensions==3.2.3
# via -r requirements/base.in
django-filter==23.5
django-filter==24.2
# via -r requirements/base.in
django-log-request-id==2.1.0
# via -r requirements/base.in
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# -r requirements/base.in
# edx-celeryutils
# edx-rbac
django-ses==3.5.2
# via -r requirements/base.in
django-simple-history==3.4.0
django-simple-history==3.5.0
# via -r requirements/base.in
django-waffle==4.1.0
# via
Expand All @@ -135,7 +138,7 @@ django-waffle==4.1.0
# edx-toggles
djangoql==0.18.1
# via -r requirements/base.in
djangorestframework==3.14.0
djangorestframework==3.15.1
# via
# -r requirements/base.in
# djangorestframework-csv
Expand All @@ -155,15 +158,15 @@ edx-auth-backends==4.2.0
# via -r requirements/base.in
edx-braze-client==0.2.2
# via -r requirements/base.in
edx-celeryutils==1.2.3
edx-celeryutils==1.2.5
# via -r requirements/base.in
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-toggles
edx-drf-extensions==10.1.0
edx-drf-extensions==10.3.0
# via
# -r requirements/base.in
# edx-rbac
Expand All @@ -177,7 +180,7 @@ edx-toggles==5.1.1
# via -r requirements/base.in
idna==3.6
# via requests
importlib-resources==6.1.1
importlib-resources==6.4.0
# via
# jsonschema
# jsonschema-specifications
Expand All @@ -195,15 +198,15 @@ jsonschema==4.21.1
# via drf-spectacular
jsonschema-specifications==2023.12.1
# via jsonschema
kombu==5.3.5
kombu==5.3.6
# via celery
markupsafe==2.1.4
markupsafe==2.1.5
# via jinja2
monotonic==1.6
# via analytics-python
mysqlclient==2.2.1
mysqlclient==2.2.4
# via -r requirements/base.in
newrelic==9.6.0
newrelic==9.8.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand All @@ -219,41 +222,39 @@ prompt-toolkit==3.0.43
# via click-repl
psutil==5.9.8
# via edx-django-utils
pycparser==2.21
pycparser==2.22
# via cffi
pyjwt[crypto]==2.8.0
# via
# drf-jwt
# edx-auth-backends
# edx-drf-extensions
# edx-rest-api-client
# pyjwt
# social-auth-core
pymongo==3.13.0
# via edx-opaque-keys
pynacl==1.5.0
# via edx-django-utils
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# analytics-python
# botocore
# celery
python-slugify==8.0.3
python-slugify==8.0.4
# via code-annotations
python3-openid==3.2.0
# via social-auth-core
pytz==2023.4
pytz==2024.1
# via
# -r requirements/base.in
# django-ses
# djangorestframework
pyyaml==6.0.1
# via
# code-annotations
# drf-spectacular
redis==5.0.1
redis==5.0.3
# via -r requirements/base.in
referencing==0.33.0
referencing==0.34.0
# via
# jsonschema
# jsonschema-specifications
Expand All @@ -265,15 +266,15 @@ requests==2.31.0
# requests-oauthlib
# slumber
# social-auth-core
requests-oauthlib==1.3.1
requests-oauthlib==2.0.0
# via social-auth-core
rpds-py==0.17.1
rpds-py==0.18.0
# via
# jsonschema
# referencing
rules==3.3
# via -r requirements/base.in
s3transfer==0.10.0
s3transfer==0.10.1
# via boto3
semantic-version==2.10.0
# via edx-drf-extensions
Expand All @@ -282,34 +283,33 @@ simplejson==3.19.2
six==1.16.0
# via
# analytics-python
# django-autocomplete-light
# edx-auth-backends
# edx-rbac
# python-dateutil
slumber==0.7.1
# via edx-rest-api-client
social-auth-app-django==5.4.0
# via edx-auth-backends
social-auth-core==4.5.2
social-auth-core==4.5.3
# via
# edx-auth-backends
# social-auth-app-django
sqlparse==0.4.4
# via django
stevedore==5.1.0
stevedore==5.2.0
# via
# code-annotations
# edx-django-utils
# edx-opaque-keys
text-unidecode==1.3
# via python-slugify
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# asgiref
# drf-spectacular
# edx-opaque-keys
# kombu
tzdata==2023.4
tzdata==2024.1
# via
# backports-zoneinfo
# celery
Expand All @@ -326,7 +326,7 @@ vine==5.1.0
# kombu
wcwidth==0.2.13
# via prompt-toolkit
zipp==3.17.0
zipp==3.18.1
# via
# -r requirements/base.in
# importlib-resources
11 changes: 10 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,20 @@


# using LTS django version

Django<5.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
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected


# 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 13a032b

Please sign in to comment.