Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
macdiesel authored Nov 2, 2023
2 parents e85de46 + 7a7ff2e commit 963697c
Show file tree
Hide file tree
Showing 11 changed files with 225 additions and 183 deletions.
40 changes: 22 additions & 18 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ celery==5.3.4
# edx-celeryutils
certifi==2023.7.22
# via requests
cffi==1.15.1
cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via
Expand All @@ -55,7 +55,7 @@ click-repl==0.3.0
# via celery
code-annotations==1.5.0
# via edx-toggles
cryptography==41.0.4
cryptography==41.0.5
# via
# pyjwt
# social-auth-core
Expand All @@ -64,8 +64,9 @@ defusedxml==0.7.1
# djangorestframework-xml
# python3-openid
# social-auth-core
django==4.2.5
django==4.2.7
# via
# -c requirements/constraints.txt
# -r requirements/base.in
# django-celery-results
# django-clearcache
Expand Down Expand Up @@ -95,7 +96,7 @@ django-clearcache==1.2.1
# via -r requirements/base.in
django-config-models==2.5.1
# via -r requirements/base.in
django-cors-headers==4.2.0
django-cors-headers==4.3.0
# via -r requirements/base.in
django-crum==0.7.9
# via
Expand All @@ -113,7 +114,9 @@ django-model-utils==4.3.1
# edx-celeryutils
# edx-rbac
django-simple-history==3.4.0
# via -r requirements/base.in
# via
# -c requirements/constraints.txt
# -r requirements/base.in
django-waffle==4.0.0
# via
# edx-django-utils
Expand Down Expand Up @@ -146,15 +149,15 @@ edx-django-utils==5.7.0
# edx-drf-extensions
# edx-rest-api-client
# edx-toggles
edx-drf-extensions==8.10.0
edx-drf-extensions==8.13.0
# via
# -r requirements/base.in
# edx-rbac
edx-opaque-keys==2.5.1
# via edx-drf-extensions
edx-rbac==1.8.0
# via -r requirements/base.in
edx-rest-api-client==5.6.0
edx-rest-api-client==5.6.1
# via -r requirements/base.in
edx-toggles==5.1.0
# via -r requirements/base.in
Expand All @@ -172,7 +175,7 @@ jsonfield==3.1.0
# via edx-celeryutils
jsonfield2==4.0.0.post0
# via -r requirements/base.in
jsonschema==4.19.1
jsonschema==4.19.2
# via drf-spectacular
jsonschema-specifications==2023.7.1
# via jsonschema
Expand All @@ -184,7 +187,7 @@ monotonic==1.6
# via analytics-python
mysqlclient==2.2.0
# via -r requirements/base.in
newrelic==9.1.0
newrelic==9.1.1
# via edx-django-utils
oauthlib==3.2.2
# via
Expand All @@ -198,7 +201,7 @@ ply==3.11
# via djangoql
prompt-toolkit==3.0.39
# via click-repl
psutil==5.9.5
psutil==5.9.6
# via edx-django-utils
pycparser==2.21
# via cffi
Expand All @@ -208,6 +211,7 @@ pyjwt[crypto]==2.8.0
# edx-auth-backends
# edx-drf-extensions
# edx-rest-api-client
# pyjwt
# social-auth-core
pymemcache==4.0.0
# via -r requirements/base.in
Expand Down Expand Up @@ -251,15 +255,15 @@ requests==2.31.0
# social-auth-core
requests-oauthlib==1.3.1
# via social-auth-core
rpds-py==0.10.3
rpds-py==0.10.6
# via
# jsonschema
# referencing
rules==3.3
# via -r requirements/base.in
semantic-version==2.10.0
# via edx-drf-extensions
simplejson==3.19.1
simplejson==3.19.2
# via -r requirements/base.in
six==1.16.0
# via
Expand All @@ -270,11 +274,11 @@ six==1.16.0
# python-dateutil
slumber==0.7.1
# via edx-rest-api-client
social-auth-app-django==5.3.0
social-auth-app-django==5.4.0
# via
# -r requirements/base.in
# edx-auth-backends
social-auth-core==4.4.2
social-auth-core==4.5.0
# via
# edx-auth-backends
# social-auth-app-django
Expand All @@ -298,16 +302,16 @@ tzdata==2023.3
# celery
uritemplate==4.1.1
# via drf-spectacular
urllib3==2.0.5
urllib3==2.0.7
# via requests
vine==5.0.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.6
wcwidth==0.2.9
# via prompt-toolkit
xlsxwriter==3.1.5
xlsxwriter==3.1.9
# via -r requirements/base.in
zipp==3.17.0
# via
Expand Down
7 changes: 7 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,17 @@
# Note: Changes to this file will automatically be used by other repos, referencing
# this file from Github directly. It does not require packaging in edx-lint.


# using LTS django version


# 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
3.0.0

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
Loading

0 comments on commit 963697c

Please sign in to comment.