Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
@pwnage101
pwnage101 authored Apr 9, 2024
2 parents 47f009c + a113d37 commit 66fd2d4
Show file tree
Hide file tree
Showing 9 changed files with 147 additions and 123 deletions.
25 changes: 13 additions & 12 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ defusedxml==0.8.0rc2
# social-auth-core
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-clearcache
Expand Down Expand Up @@ -72,13 +73,13 @@ django-extensions==3.2.3
# via
# -r requirements/base.in
# openedx-ledger
django-filter==24.1
django-filter==24.2
# via
# -r requirements/base.in
# openedx-ledger
django-log-request-id==2.1.0
# via -r requirements/base.in
django-model-utils==4.4.0
django-model-utils==4.5.0
# via edx-rbac
django-object-actions==4.2.0
# via
Expand Down Expand Up @@ -108,25 +109,25 @@ djangorestframework==3.14.0
# edx-drf-extensions
drf-jwt==1.19.2
# via edx-drf-extensions
drf-spectacular==0.27.1
drf-spectacular==0.27.2
# via -r requirements/base.in
drf-yasg==1.21.7
# via -r requirements/base.in
edx-auth-backends==4.2.0
edx-auth-backends==4.3.0
# via -r requirements/base.in
edx-django-release-util==1.3.0
edx-django-release-util==1.4.0
# via
# -r requirements/base.in
# openedx-ledger
edx-django-utils==5.11.0
edx-django-utils==5.12.0
# via
# -r requirements/base.in
# edx-drf-extensions
# edx-rest-api-client
# getsmarter-api-clients
# openedx-events
# openedx-ledger
edx-drf-extensions==10.2.0
edx-drf-extensions==10.3.0
# via
# -r requirements/base.in
# edx-rbac
Expand All @@ -138,7 +139,7 @@ edx-rbac==1.8.0
# via
# -r requirements/base.in
# openedx-ledger
edx-rest-api-client==5.6.1
edx-rest-api-client==5.7.0
# via -r requirements/base.in
fastavro==1.9.4
# via openedx-events
Expand Down Expand Up @@ -166,14 +167,14 @@ mysqlclient==2.2.4
# via
# -r requirements/base.in
# openedx-ledger
newrelic==9.7.1
newrelic==9.8.0
# via edx-django-utils
oauthlib==3.2.2
# via
# getsmarter-api-clients
# requests-oauthlib
# social-auth-core
openedx-events==9.5.2
openedx-events==9.7.0
# via
# -r requirements/base.in
# openedx-ledger
Expand All @@ -189,7 +190,7 @@ ply==3.11
# via djangoql
psutil==5.9.8
# via edx-django-utils
pycparser==2.21
pycparser==2.22
# via cffi
pyjwt[crypto]==2.8.0
# via
Expand Down Expand Up @@ -264,7 +265,7 @@ stevedore==5.2.0
# via
# edx-django-utils
# edx-opaque-keys
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# asgiref
# drf-spectacular
Expand Down
16 changes: 10 additions & 6 deletions requirements/common_constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# A central location for most common version constraints
# (across edx repos) for pip-installation.
#
Expand All @@ -23,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
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
46 changes: 25 additions & 21 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,15 @@ attrs==23.2.0
# jsonschema
# openedx-events
# referencing
backports-tarfile==1.0.0
# via
# -r requirements/validation.txt
# jaraco-context
backports-zoneinfo==0.2.1
# via
# -r requirements/validation.txt
# django
build==1.1.1
build==1.2.1
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down Expand Up @@ -67,7 +71,7 @@ click-log==0.4.0
# via
# -r requirements/validation.txt
# edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via
# -r requirements/validation.txt
# edx-lint
Expand Down Expand Up @@ -148,13 +152,13 @@ django-extensions==3.2.3
# -r requirements/dev.in
# -r requirements/validation.txt
# openedx-ledger
django-filter==24.1
django-filter==24.2
# via
# -r requirements/validation.txt
# openedx-ledger
django-log-request-id==2.1.0
# via -r requirements/validation.txt
django-model-utils==4.4.0
django-model-utils==4.5.0
# via
# -r requirements/validation.txt
# edx-rbac
Expand Down Expand Up @@ -191,25 +195,25 @@ drf-jwt==1.19.2
# via
# -r requirements/validation.txt
# edx-drf-extensions
drf-spectacular==0.27.1
drf-spectacular==0.27.2
# via -r requirements/validation.txt
drf-yasg==1.21.7
# via -r requirements/validation.txt
edx-auth-backends==4.2.0
edx-auth-backends==4.3.0
# via -r requirements/validation.txt
edx-django-release-util==1.3.0
edx-django-release-util==1.4.0
# via
# -r requirements/validation.txt
# openedx-ledger
edx-django-utils==5.11.0
edx-django-utils==5.12.0
# via
# -r requirements/validation.txt
# edx-drf-extensions
# edx-rest-api-client
# getsmarter-api-clients
# openedx-events
# openedx-ledger
edx-drf-extensions==10.2.0
edx-drf-extensions==10.3.0
# via
# -r requirements/validation.txt
# edx-rbac
Expand All @@ -226,15 +230,15 @@ edx-rbac==1.8.0
# via
# -r requirements/validation.txt
# openedx-ledger
edx-rest-api-client==5.6.1
edx-rest-api-client==5.7.0
# via -r requirements/validation.txt
exceptiongroup==1.2.0
# via
# -r requirements/validation.txt
# pytest
factory-boy==3.3.0
# via -r requirements/validation.txt
faker==24.4.0
faker==24.7.1
# via
# -r requirements/validation.txt
# factory-boy
Expand All @@ -253,7 +257,7 @@ idna==3.6
# via
# -r requirements/validation.txt
# requests
importlib-metadata==7.1.0
importlib-metadata==6.11.0
# via
# -r requirements/pip-tools.txt
# -r requirements/validation.txt
Expand All @@ -279,11 +283,11 @@ isort==5.13.2
# via
# -r requirements/validation.txt
# pylint
jaraco-classes==3.3.1
jaraco-classes==3.4.0
# via
# -r requirements/validation.txt
# keyring
jaraco-context==4.3.0
jaraco-context==5.3.0
# via
# -r requirements/validation.txt
# keyring
Expand Down Expand Up @@ -313,11 +317,11 @@ jsonschema-specifications==2023.12.1
# via
# -r requirements/validation.txt
# jsonschema
keyring==25.0.0
keyring==25.1.0
# via
# -r requirements/validation.txt
# twine
lxml==5.1.0
lxml==5.2.1
# via edx-i18n-tools
markdown-it-py==3.0.0
# via
Expand Down Expand Up @@ -346,7 +350,7 @@ mysqlclient==2.2.4
# via
# -r requirements/validation.txt
# openedx-ledger
newrelic==9.7.1
newrelic==9.8.0
# via
# -r requirements/validation.txt
# edx-django-utils
Expand All @@ -360,7 +364,7 @@ oauthlib==3.2.2
# getsmarter-api-clients
# requests-oauthlib
# social-auth-core
openedx-events==9.5.2
openedx-events==9.7.0
# via
# -r requirements/validation.txt
# openedx-ledger
Expand All @@ -375,7 +379,7 @@ packaging==24.0
# pyproject-api
# pytest
# tox
path==16.10.0
path==16.12.1
# via edx-i18n-tools
pbr==6.0.0
# via
Expand Down Expand Up @@ -415,7 +419,7 @@ psutil==5.9.8
# edx-django-utils
pycodestyle==2.11.1
# via -r requirements/validation.txt
pycparser==2.21
pycparser==2.22
# via
# -r requirements/validation.txt
# cffi
Expand Down Expand Up @@ -631,7 +635,7 @@ tox==4.14.2
# via -r requirements/validation.txt
twine==5.0.0
# via -r requirements/validation.txt
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/validation.txt
# asgiref
Expand Down
Loading

0 comments on commit 66fd2d4

Please sign in to comment.