Skip to content

Commit

Permalink
perf(django32): add compatibility with openedx maple release (#197)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Drop python 3.5 support in favor of python 3.8.
  • Loading branch information
Alec4r committed Mar 4, 2022
1 parent 1595948 commit 74a6160
Show file tree
Hide file tree
Showing 17 changed files with 620 additions and 267 deletions.
12 changes: 3 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,9 @@ workflows:
only: /v?[0-9]+(\.[0-9]+)*/
matrix:
parameters:
python_version: ["3.5", "3.8"]
debian_version: ["stretch", "buster"]
exclude:
- python_version: "3.8"
debian_version: "stretch"
- python_version: "3.5"
debian_version: "buster"
python_version: ["3.8"]
debian_version: ["buster"]
django_version: ["django22", "django32"]
- pypi:
requires:
- test
Expand All @@ -35,12 +31,10 @@ jobs:
parameters:
django_version:
type: string
default: django22
python_version:
type: string
debian_version:
type: string
default: stretch
docker:
# specify the version you desire here
# use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ python-test: clean ## Run tests
python-quality-test:
$(TOX) pylint ./eox_core
$(TOX) pycodestyle ./eox_core
$(TOX) isort --check-only --recursive --diff ./eox_core
$(TOX) isort --check-only --diff ./eox_core

run-tests: python-test python-quality-test

Expand Down
10 changes: 10 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ Compatibility Notes
+-------------------+----------+
| Lilac | >= 4.9 |
+-------------------+----------+
| Maple | >= 6.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.
Expand Down Expand Up @@ -128,6 +130,14 @@ not listed, then the accumulation of changes from previous releases is enough.
EOX_CORE_PRE_ENROLLMENT_BACKEND: "eox_core.edxapp_wrapper.backends.pre_enrollment_l_v1"
EOX_CORE_ENROLLMENT_BACKEND: "eox_core.edxapp_wrapper.backends.enrollment_l_v1"
**Maple**

.. code-block:: yaml
EOX_CORE_USERS_BACKEND: "eox_core.edxapp_wrapper.backends.users_m_v1"
EOX_CORE_PRE_ENROLLMENT_BACKEND: "eox_core.edxapp_wrapper.backends.pre_enrollment_l_v1"
EOX_CORE_ENROLLMENT_BACKEND: "eox_core.edxapp_wrapper.backends.enrollment_l_v1"
These settings can be changed in ``eox_core/settings/common.py`` or, for example, in ansible configurations.

**NOTE**: the current ``common.py`` works with Open edX juniper version.
Expand Down
2 changes: 1 addition & 1 deletion eox_core/api/data/v1/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
from __future__ import unicode_literals

from django.utils import six
import six
from rest_framework import relations


Expand Down
2 changes: 1 addition & 1 deletion eox_core/api/v1/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import logging

import edx_api_doc_tools as apidocs
import six
from django.conf import settings
from django.contrib.sites.shortcuts import get_current_site
from django.utils import six
from rest_framework import status
from rest_framework.authentication import SessionAuthentication
from rest_framework.exceptions import APIException, NotFound, ValidationError
Expand Down
Loading

0 comments on commit 74a6160

Please sign in to comment.