Skip to content

Commit

Permalink
Merge pull request #33873 from openedx/mahamakifdar19/upgrade-edx-ent…
Browse files Browse the repository at this point in the history
…erprise-f9b6e45

feat: Upgrade Python dependency edx-enterprise
  • Loading branch information
mahamakifdar19 authored Dec 4, 2023
2 parents f9b6e45 + e2bf660 commit ecc46cb
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 16 deletions.
5 changes: 0 additions & 5 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,3 @@ Django<4.0
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected

# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
# This constraint can be removed once the issue
# https://github.com/pypa/virtualenv/issues/2666 gets resolved
platformdirs<4.0
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.8.3
edx-enterprise==4.8.4

# django-oauth-toolkit version >=2.0.0 has breaking changes. More details
# mentioned on this issue https://github.com/openedx/edx-platform/issues/32884
Expand Down
6 changes: 2 additions & 4 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ edx-drf-extensions==9.0.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.8.3
edx-enterprise==4.8.4
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
Expand Down Expand Up @@ -826,9 +826,7 @@ pillow==10.1.0
pkgutil-resolve-name==1.3.10
# via jsonschema
platformdirs==3.11.0
# via
# -c requirements/edx/../common_constraints.txt
# snowflake-connector-python
# via snowflake-connector-python
polib==1.2.0
# via edx-i18n-tools
prompt-toolkit==3.0.41
Expand Down
3 changes: 1 addition & 2 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ edx-drf-extensions==9.0.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.8.3
edx-enterprise==4.8.4
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -1400,7 +1400,6 @@ pkgutil-resolve-name==1.3.10
# jsonschema
platformdirs==3.11.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# pylint
Expand Down
3 changes: 1 addition & 2 deletions requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ edx-drf-extensions==9.0.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.8.3
edx-enterprise==4.8.4
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -980,7 +980,6 @@ pkgutil-resolve-name==1.3.10
# jsonschema
platformdirs==3.11.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
# snowflake-connector-python
polib==1.2.0
Expand Down
3 changes: 1 addition & 2 deletions requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ edx-drf-extensions==9.0.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.8.3
edx-enterprise==4.8.4
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -1041,7 +1041,6 @@ pkgutil-resolve-name==1.3.10
# jsonschema
platformdirs==3.11.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
# pylint
# snowflake-connector-python
Expand Down

0 comments on commit ecc46cb

Please sign in to comment.