Skip to content

Commit

Permalink
feat: added palm support and changed default settings to always use e…
Browse files Browse the repository at this point in the history
…ox_tenant
  • Loading branch information
Asespinel committed Nov 17, 2023
1 parent 715dc68 commit 2f38709
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 42 deletions.
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Compatibility Notes
+-------------------+-----------------------+
| Olive | >= 8.0 |
+-------------------+-----------------------+
| Palm | >= 9.3 |
+-------------------+-----------------------+

**NOTE**: Since 6.2 version, eox-tenant does not support Django 2.2

Expand Down
2 changes: 1 addition & 1 deletion eox_tenant/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def plugin_settings(settings):
settings.CHANGE_DOMAIN_DEFAULT_SITE_NAME = "stage.edunext.co"
settings.EOX_TENANT_LOAD_PERMISSIONS = True
settings.EOX_TENANT_APPEND_LMS_MIDDLEWARE_CLASSES = False
settings.USE_EOX_TENANT = False
settings.USE_EOX_TENANT = True

settings.EOX_TENANT_ASYNC_TASKS_HANDLER_DICT = {
"openedx.core.djangoapps.schedules.tasks.ScheduleRecurringNudge": "get_host_from_siteid",
Expand Down
16 changes: 9 additions & 7 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# make upgrade
#
asgiref==3.6.0
asgiref==3.7.2
# via django
django==3.2.16
django==3.2.23
# via
# -c requirements/constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -35,25 +35,27 @@ jsonfield==3.1.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
openedx-filters==1.4.0
openedx-filters==1.2.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
pbr==5.11.1
pbr==6.0.0
# via stevedore
pymongo==3.13.0
# via
# -c requirements/constraints.txt
# edx-opaque-keys
pytz==2022.7.1
pytz==2023.3.post1
# via
# django
# djangorestframework
six==1.16.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
sqlparse==0.4.3
sqlparse==0.4.4
# via django
stevedore==4.1.1
stevedore==5.1.0
# via edx-opaque-keys
typing-extensions==4.8.0
# via asgiref
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ path-py==12.5.0
pycodestyle<2.9.0
pylint==2.13.9
testfixtures==7.0.0
openedx_filters==0.8.0
openedx_filters==1.2.0
2 changes: 1 addition & 1 deletion requirements/django.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django==3.2.16
django==3.2.23
19 changes: 13 additions & 6 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,27 @@
#
# make upgrade
#
build==0.10.0
build==1.0.3
# via pip-tools
click==8.1.3
click==8.1.7
# via pip-tools
packaging==23.0
importlib-metadata==6.8.0
# via build
pip-tools==6.12.1
packaging==23.2
# via build
pip-tools==7.3.0
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via build
wheel==0.38.4
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.41.3
# via pip-tools
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
32 changes: 16 additions & 16 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
#
# make upgrade
#
asgiref==3.6.0
asgiref==3.7.2
# via
# -r requirements/base.txt
# django
astroid==2.11.7
# via pylint
coverage[toml]==6.5.0
coverage==6.5.0
# via
# -c requirements/constraints.txt
# -r requirements/test.in
ddt==1.6.0
# via
# -c requirements/constraints.txt
# -r requirements/test.in
dill==0.3.6
dill==0.3.7
# via pylint
# via
# -c requirements/constraints.txt
Expand Down Expand Up @@ -48,7 +48,7 @@ edx-opaque-keys[django]==2.3.0
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
isort==5.11.4
isort==5.12.0
# via pylint
jsonfield==3.1.0
# via
Expand All @@ -62,21 +62,21 @@ mock==4.0.3
# via
# -c requirements/constraints.txt
# -r requirements/test.in
openedx-filters==1.4.0
openedx-filters==1.2.0
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
path==16.6.0
path==16.7.1
# via path-py
path-py==12.5.0
# via
# -c requirements/constraints.txt
# -r requirements/test.in
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements/base.txt
# stevedore
platformdirs==2.6.2
platformdirs==4.0.0
# via pylint
pycodestyle==2.8.0
# via
Expand All @@ -91,7 +91,7 @@ pymongo==3.13.0
# -c requirements/constraints.txt
# -r requirements/base.txt
# edx-opaque-keys
pytz==2022.7.1
pytz==2023.3.post1
# via
# -r requirements/base.txt
# django
Expand All @@ -100,11 +100,11 @@ six==1.16.0
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -r requirements/base.txt
# django
stevedore==4.1.1
stevedore==5.1.0
# via
# -r requirements/base.txt
# edx-opaque-keys
Expand All @@ -113,14 +113,14 @@ testfixtures==7.0.0
# -c requirements/constraints.txt
# -r requirements/test.in
tomli==2.0.1
# via pylint
typing-extensions==4.8.0
# via
# coverage
# pylint
typing-extensions==4.4.0
# via
# -r requirements/base.txt
# asgiref
# astroid
# pylint
wrapt==1.14.1
wrapt==1.16.0
# via astroid

# The following packages are considered to be unsafe in a requirements file:
Expand Down
20 changes: 10 additions & 10 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@
#
# make upgrade
#
cachetools==5.2.1
cachetools==5.3.2
# via tox
chardet==5.1.0
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.6
distlib==0.3.7
# via virtualenv
filelock==3.9.0
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.0
packaging==23.2
# via
# pyproject-api
# tox
platformdirs==2.6.2
platformdirs==3.11.0
# via
# tox
# virtualenv
pluggy==1.0.0
pluggy==1.3.0
# via tox
pyproject-api==1.5.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.3.4
tox==4.11.3
# via -r requirements/tox.in
virtualenv==20.17.1
virtualenv==20.24.6
# via tox

0 comments on commit 2f38709

Please sign in to comment.