Skip to content

Commit

Permalink
Merge pull request #35154 from openedx/katrinan029/upgrade-edx-enterp…
Browse files Browse the repository at this point in the history
…rise-a196977

feat: Upgrade Python dependency edx-enterprise
  • Loading branch information
katrinan029 authored Jul 22, 2024
2 parents a196977 + d35d13b commit 7ae80be
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 5 deletions.
8 changes: 8 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ 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
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
Expand All @@ -33,3 +34,10 @@ elasticsearch<7.14.0
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7

# Cause: https://github.com/openedx/event-tracking/pull/290
# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
# We will pin event-tracking to do not break existing installations
# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
# has been resolved and edx-platform is running with pymongo>=4.4.0
event-tracking<2.4.1
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ celery>=5.2.2,<6.0.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.21.5
edx-enterprise==4.21.7

# Stay on LTS version, remove once this is added to common constraint
Django<5.0
Expand Down
3 changes: 2 additions & 1 deletion requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.21.5
edx-enterprise==4.21.7
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
Expand Down Expand Up @@ -537,6 +537,7 @@ enmerkar-underscore==2.3.0
# via -r requirements/edx/kernel.in
event-tracking==2.4.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/kernel.in
# edx-completion
# edx-proctoring
Expand Down
3 changes: 2 additions & 1 deletion requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.21.5
edx-enterprise==4.21.7
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -854,6 +854,7 @@ enmerkar-underscore==2.3.0
# -r requirements/edx/testing.txt
event-tracking==2.4.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edx-completion
Expand Down
3 changes: 2 additions & 1 deletion requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.21.5
edx-enterprise==4.21.7
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -615,6 +615,7 @@ enmerkar-underscore==2.3.0
# via -r requirements/edx/base.txt
event-tracking==2.4.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
# edx-completion
# edx-proctoring
Expand Down
3 changes: 2 additions & 1 deletion requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.21.5
edx-enterprise==4.21.7
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -651,6 +651,7 @@ enmerkar-underscore==2.3.0
# via -r requirements/edx/base.txt
event-tracking==2.4.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
# edx-completion
# edx-proctoring
Expand Down

0 comments on commit 7ae80be

Please sign in to comment.