Skip to content

Commit

Permalink
Merge pull request openedx#34359 from openedx/hamzawaleed01/upgrade-e…
Browse files Browse the repository at this point in the history
…dx-enterprise-19c04fc

feat: Upgrade Python dependency edx-enterprise
  • Loading branch information
hamzawaleed01 authored Mar 13, 2024
2 parents 19c04fc + 86215c8 commit ec1e58f
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 12 deletions.
9 changes: 9 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,12 @@ Django<5.0
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
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ click>=8.0,<9.0
# The team that owns this package will manually bump this package rather than having it pulled in automatically.
# This is to allow them to better control its deployment and to do it in a process that works better
# for them.
edx-enterprise==4.13.5
edx-enterprise==4.13.6

# Stay on LTS version, remove once this is added to common constraint
Django<5.0
Expand Down
8 changes: 5 additions & 3 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ edx-drf-extensions==10.2.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.13.5
edx-enterprise==4.13.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
Expand Down Expand Up @@ -607,8 +607,10 @@ idna==3.6
# requests
# snowflake-connector-python
# yarl
importlib-metadata==7.0.1
# via markdown
importlib-metadata==6.11.0
# via
# -c requirements/edx/../common_constraints.txt
# markdown
importlib-resources==5.13.0
# via
# jsonschema
Expand Down
5 changes: 3 additions & 2 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ edx-drf-extensions==10.2.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.13.5
edx-enterprise==4.13.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -993,8 +993,9 @@ imagesize==1.4.1
# sphinx
import-linter==2.0
# via -r requirements/edx/testing.txt
importlib-metadata==7.0.1
importlib-metadata==6.11.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/../pip-tools.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down
5 changes: 3 additions & 2 deletions requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ edx-drf-extensions==10.2.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.13.5
edx-enterprise==4.13.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -700,8 +700,9 @@ idna==3.6
# yarl
imagesize==1.4.1
# via sphinx
importlib-metadata==7.0.1
importlib-metadata==6.11.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
# markdown
# sphinx
Expand Down
5 changes: 3 additions & 2 deletions requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ edx-drf-extensions==10.2.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.13.5
edx-enterprise==4.13.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -747,8 +747,9 @@ idna==3.6
# yarl
import-linter==2.0
# via -r requirements/edx/testing.in
importlib-metadata==7.0.1
importlib-metadata==6.11.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
# markdown
# pytest-randomly
Expand Down
6 changes: 4 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ click==8.1.6
# via
# -c requirements/constraints.txt
# pip-tools
importlib-metadata==7.0.1
# via build
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# build
packaging==23.2
# via build
pip-tools==7.4.0
Expand Down

0 comments on commit ec1e58f

Please sign in to comment.