Skip to content

Commit 7ae80be

Browse files
authored
Merge pull request #35154 from openedx/katrinan029/upgrade-edx-enterprise-a196977
feat: Upgrade Python dependency edx-enterprise
2 parents a196977 + d35d13b commit 7ae80be

File tree

6 files changed

+17
-5
lines changed

6 files changed

+17
-5
lines changed

requirements/common_constraints.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Django<5.0
2121

2222
# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
2323
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
24+
# See https://github.com/openedx/edx-platform/issues/35126 for more info
2425
elasticsearch<7.14.0
2526

2627
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
@@ -33,3 +34,10 @@ elasticsearch<7.14.0
3334
# So we need to pin it globally, for now.
3435
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
3536
importlib-metadata<7
37+
38+
# Cause: https://github.com/openedx/event-tracking/pull/290
39+
# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
40+
# We will pin event-tracking to do not break existing installations
41+
# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
42+
# has been resolved and edx-platform is running with pymongo>=4.4.0
43+
event-tracking<2.4.1

requirements/constraints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ celery>=5.2.2,<6.0.0
2020
# The team that owns this package will manually bump this package rather than having it pulled in automatically.
2121
# This is to allow them to better control its deployment and to do it in a process that works better
2222
# for them.
23-
edx-enterprise==4.21.5
23+
edx-enterprise==4.21.7
2424

2525
# Stay on LTS version, remove once this is added to common constraint
2626
Django<5.0

requirements/edx/base.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ edx-drf-extensions==10.3.0
451451
# edx-when
452452
# edxval
453453
# openedx-learning
454-
edx-enterprise==4.21.5
454+
edx-enterprise==4.21.7
455455
# via
456456
# -c requirements/edx/../constraints.txt
457457
# -r requirements/edx/kernel.in
@@ -537,6 +537,7 @@ enmerkar-underscore==2.3.0
537537
# via -r requirements/edx/kernel.in
538538
event-tracking==2.4.0
539539
# via
540+
# -c requirements/edx/../common_constraints.txt
540541
# -r requirements/edx/kernel.in
541542
# edx-completion
542543
# edx-proctoring

requirements/edx/development.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ edx-drf-extensions==10.3.0
724724
# edx-when
725725
# edxval
726726
# openedx-learning
727-
edx-enterprise==4.21.5
727+
edx-enterprise==4.21.7
728728
# via
729729
# -c requirements/edx/../constraints.txt
730730
# -r requirements/edx/doc.txt
@@ -854,6 +854,7 @@ enmerkar-underscore==2.3.0
854854
# -r requirements/edx/testing.txt
855855
event-tracking==2.4.0
856856
# via
857+
# -c requirements/edx/../common_constraints.txt
857858
# -r requirements/edx/doc.txt
858859
# -r requirements/edx/testing.txt
859860
# edx-completion

requirements/edx/doc.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ edx-drf-extensions==10.3.0
523523
# edx-when
524524
# edxval
525525
# openedx-learning
526-
edx-enterprise==4.21.5
526+
edx-enterprise==4.21.7
527527
# via
528528
# -c requirements/edx/../constraints.txt
529529
# -r requirements/edx/base.txt
@@ -615,6 +615,7 @@ enmerkar-underscore==2.3.0
615615
# via -r requirements/edx/base.txt
616616
event-tracking==2.4.0
617617
# via
618+
# -c requirements/edx/../common_constraints.txt
618619
# -r requirements/edx/base.txt
619620
# edx-completion
620621
# edx-proctoring

requirements/edx/testing.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ edx-drf-extensions==10.3.0
555555
# edx-when
556556
# edxval
557557
# openedx-learning
558-
edx-enterprise==4.21.5
558+
edx-enterprise==4.21.7
559559
# via
560560
# -c requirements/edx/../constraints.txt
561561
# -r requirements/edx/base.txt
@@ -651,6 +651,7 @@ enmerkar-underscore==2.3.0
651651
# via -r requirements/edx/base.txt
652652
event-tracking==2.4.0
653653
# via
654+
# -c requirements/edx/../common_constraints.txt
654655
# -r requirements/edx/base.txt
655656
# edx-completion
656657
# edx-proctoring

0 commit comments

Comments
 (0)