perf: eox-theming support for Nutmeg release (#40)

BREAKING CHANGE: remove support version v3.1.0 * perf: add compatibility with openedx nutmeg release * ci(circleci): remove ci and update github actions * build: update requirements and tox * docs: add nutmeg info to README file * build: update requirements
eduNEXT · Sep 20, 2022 · 5e094e7 · 5e094e7
1 parent 8433ec2
commit 5e094e7
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 171 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,8 +11,8 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: ["3.8"]
-        django: ["22","32"]
+        python-version: ["3.8", "3.10"]
+        django: ["32"]
 
     steps:
       - name: Checkout

diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
 	$(PIP_COMPILE) -o requirements/test.txt requirements/test.in
 	$(PIP_COMPILE) -o requirements/tox.txt requirements/tox.in
 
-	grep -e "^django==" requirements/test.txt > requirements/django22.txt
+	grep -e "^django==" requirements/test.txt
 	sed '/^[dD]jango==/d;' requirements/test.txt > requirements/test.tmp
 	mv requirements/test.tmp requirements/test.txt
 

diff --git a/README.md b/README.md
@@ -12,8 +12,9 @@ This plugin provides a stable place from where to create and launch your openedx
 | ---------------- | -------------------:|
 |     Juniper      |       >= 1.0 < 2.0  |
 |       Koa        |       >= 2.0 < 3.0  |
-|      Lilac       |         >= 2.0      |
-|      Maple       |         >= 3.0      |
+|      Lilac       |       >= 2.0 < 4.0  |
+|      Maple       |       >= 3.0 < 4.0  |
+|      Nutmeg      |         >= 4.0      |
 
 The following changes to the plugin settings are necessary. If the release you are looking for is
 not listed, then the accumulation of changes from previous releases is enough.
@@ -38,7 +39,7 @@ EOX_THEMING_STORAGE_BACKEND = 'eox_theming.edxapp_wrapper.backends.l_storage'
 EOX_THEMING_EDXMAKO_BACKEND = 'eox_theming.edxapp_wrapper.backends.l_mako'
 ```
 
-### Lilac - Maple
+### Lilac - Maple - Nutmeg
 
 ```
 EOX_THEMING_STORAGE_BACKEND = 'eox_theming.edxapp_wrapper.backends.l_storage'
@@ -48,6 +49,7 @@ EOX_THEMING_STORAGE_BACKEND = 'eox_theming.edxapp_wrapper.backends.l_storage'
 Those settings can be changed in `eox_theming/settings/common.py` or, for example, in ansible configurations.
 
 **NOTE**: the current ``common.py`` works with Open edX lilac version.
+**NOTE**: Nutmeg release not support Django22
 
 
 ## Installation

diff --git a/requirements/base.in b/requirements/base.in
@@ -3,3 +3,4 @@
 
 Django
 six
+eox-tenant @ git+https://github.com/eduNEXT/eox-tenant.git
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,16 +1,20 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    make upgrade
 #
-asgiref==3.5.0
+asgiref==3.5.2
     # via django
-django==3.2.12
+django==3.2.15
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
-pytz==2021.3
+eox-tenant @ git+https://github.com/eduNEXT/eox-tenant.git
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/base.in
+pytz==2022.1
     # via
     #   -c requirements/constraints.txt
     #   django

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -9,15 +9,18 @@
 # linking to it here is good.
 
 # Keep same platform version
-Django<=3.2.12
-pylint==2.12.2
-testfixtures==6.18.4
-coverage[toml]==6.0.2
-mako==1.1.5
+Django<=3.2.15
+pylint==2.13.5
+testfixtures==6.18.5
+coverage[toml]==6.3.2
+mako==1.2.0
 mock==4.0.3
 path-py==12.5.0
 pycodestyle==2.8.0
-pytz==2021.3
+pytz==2022.1
 
-# Version used in Maple version of edx-platform
+# Version used in Nutmeg version of edx-platform
 edx-opaque-keys==2.3.0
+
+# Version used in Nutmeg version of eox-tenant
+eox-tenant<7.0.0
diff --git a/requirements/django22.txt b/requirements/django22.txt
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -1,17 +1,25 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    make upgrade
 #
-click==8.0.4
+build==0.8.0
     # via pip-tools
-pep517==0.12.0
+click==8.1.3
     # via pip-tools
-pip-tools==6.5.1
+packaging==21.3
+    # via build
+pep517==0.13.0
+    # via build
+pip-tools==6.8.0
     # via -r requirements/pip-tools.in
+pyparsing==3.0.9
+    # via packaging
 tomli==2.0.1
-    # via pep517
+    # via
+    #   build
+    #   pep517
 wheel==0.37.1
     # via pip-tools
 

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -1,36 +1,42 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    make upgrade
 #
-asgiref==3.5.0
+asgiref==3.5.2
     # via
     #   -r requirements/base.txt
     #   django
-astroid==2.9.3
+astroid==2.11.7
     # via
     #   -r requirements/test.in
     #   pylint
-coverage[toml]==6.0.2
+coverage[toml]==6.3.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.in
+dill==0.3.5.1
+    # via pylint
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   -r requirements/test.in
+eox-tenant @ git+https://github.com/eduNEXT/eox-tenant.git
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/base.txt
 isort==5.10.1
     # via pylint
 lazy-object-proxy==1.7.1
     # via astroid
-mako==1.1.5
+mako==1.2.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.in
-markupsafe==2.1.0
+markupsafe==2.1.1
     # via mako
-mccabe==0.6.1
+mccabe==0.7.0
     # via pylint
 mock==4.0.3
     # via
@@ -42,17 +48,17 @@ path-py==12.5.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.in
-platformdirs==2.5.1
+platformdirs==2.5.2
     # via pylint
 pycodestyle==2.8.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.in
-pylint==2.12.2
+pylint==2.13.5
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.in
-pytz==2021.3
+pytz==2022.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
@@ -63,19 +69,15 @@ sqlparse==0.4.2
     # via
     #   -r requirements/base.txt
     #   django
-testfixtures==6.18.4
+testfixtures==6.18.5
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.in
-toml==0.10.2
-    # via pylint
 tomli==2.0.1
-    # via coverage
-typing-extensions==4.1.1
     # via
-    #   astroid
+    #   coverage
     #   pylint
-wrapt==1.13.3
+wrapt==1.14.1
     # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/tox.txt b/requirements/tox.txt
@@ -1,32 +1,30 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    make upgrade
 #
-distlib==0.3.4
+distlib==0.3.6
     # via virtualenv
-filelock==3.6.0
+filelock==3.8.0
     # via
     #   tox
     #   virtualenv
 packaging==21.3
     # via tox
-platformdirs==2.5.1
+platformdirs==2.5.2
     # via virtualenv
 pluggy==1.0.0
     # via tox
 py==1.11.0
     # via tox
-pyparsing==3.0.7
+pyparsing==3.0.9
     # via packaging
 six==1.16.0
-    # via
-    #   tox
-    #   virtualenv
-toml==0.10.2
     # via tox
-tox==3.24.5
+tomli==2.0.1
+    # via tox
+tox==3.26.0
     # via -r requirements/tox.in
-virtualenv==20.13.2
+virtualenv==20.16.5
     # via tox