diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d33565c..02521da 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,8 +11,8 @@ jobs: strategy: max-parallel: 2 matrix: - python-version: ["3.8", "3.10", "3.11"] - django: ["32", "42"] + python-version: ["3.8", "3.11"] + django: ["42"] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 88de9ea..9697ada 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on ## [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v8.0.0](https://github.com/eduNEXT/eox-tagging/compare/v7.3.0...v8.0.0) - (2024-10-22) + +#### ⚠ BREAKING CHANGES + +- **Dropped Support for Django 3.2**: Removed support for Django 3.2 in this plugin. As a result, we have also dropped support for Open edX releases from Maple up to and including Palm, which rely on Django 3.2. Future versions of this plugin may not be compatible with these Open edX releases. + ## [v7.3.0](https://github.com/eduNEXT/eox-tagging/compare/v7.2.0...v7.3.0) - (2024-10-01) ### Added diff --git a/README.rst b/README.rst index 9386dc2..fd02682 100644 --- a/README.rst +++ b/README.rst @@ -29,29 +29,29 @@ Installation Compatibility Notes -------------------- -+------------------+--------------+ -| Open edX Release | Version | -+==================+==============+ -| Ironwood | < 0.9 < 3.0 | -+------------------+--------------+ -| Juniper | >= 0.9 < 3.0 | -+------------------+--------------+ -| Koa | >= 2.2 < 5.0 | -+------------------+--------------+ -| Lilac | >= 2.2 < 5.0 | -+------------------+--------------+ -| Maple | >= 4.0 < 6.0 | -+------------------+--------------+ -| Nutmeg | >= 5.0 < 6.0 | -+------------------+--------------+ -| Olive | >= 5.0 < 6.0 | -+------------------+--------------+ -| Palm | >= 6.0 | -+------------------+--------------+ -| Quince | >= 7.0 | -+------------------+--------------+ -| Redwood | >= 7.2.0 | -+------------------+--------------+ ++------------------+---------------+ +| Open edX Release | Version | ++==================+===============+ +| Ironwood | < 0.9 < 3.0 | ++------------------+---------------+ +| Juniper | >= 0.9 < 3.0 | ++------------------+---------------+ +| Koa | >= 2.2 < 5.0 | ++------------------+---------------+ +| Lilac | >= 2.2 < 5.0 | ++------------------+---------------+ +| Maple | >= 4.0 < 6.0 | ++------------------+---------------+ +| Nutmeg | >= 5.0 < 6.0 | ++------------------+---------------+ +| Olive | >= 5.0 < 6.0 | ++------------------+---------------+ +| Palm | >= 6.0 < 8.0 | ++------------------+---------------+ +| Quince | >= 7.0 | ++------------------+---------------+ +| Redwood | >= 7.2.0 | ++------------------+---------------+ The plugin is configured for the latest release (Quince). The following changes in the plugin settings should be applied to be used for previous releases. Those settings can be changed in `eox_tagging/settings/common.py`` or, for example, in the instance configurations. diff --git a/eox_tagging/__init__.py b/eox_tagging/__init__.py index fc69d25..c8f8fee 100644 --- a/eox_tagging/__init__.py +++ b/eox_tagging/__init__.py @@ -4,4 +4,4 @@ from __future__ import unicode_literals -__version__ = '7.3.0' +__version__ = '8.0.0' diff --git a/requirements/base.txt b/requirements/base.txt index b022703..8142f55 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -50,7 +50,7 @@ click-repl==0.3.0 # via celery code-annotations==1.8.0 # via edx-toggles -cryptography==43.0.1 +cryptography==43.0.3 # via # jwcrypto # pyjwt @@ -85,20 +85,16 @@ django-crum==0.7.9 # edx-django-utils # edx-proctoring # edx-toggles -django-filter==23.5 - # via - # -c requirements/constraints.txt - # eox-core +django-filter==24.3 + # via eox-core django-ipware==7.0.1 # via edx-proctoring django-model-utils==5.0.0 # via # edx-proctoring # edx-when -django-oauth-toolkit==2.4.0 - # via - # -c requirements/constraints.txt - # eox-core +django-oauth-toolkit==3.0.1 + # via eox-core django-oauth2-provider==0.2.6.1 # via eox-core django-simple-history==3.0.0 @@ -114,9 +110,8 @@ django-waffle==4.1.0 # eox-core django-webpack-loader==3.1.1 # via edx-proctoring -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via - # -c requirements/constraints.txt # drf-jwt # drf-yasg # edx-api-doc-tools @@ -125,13 +120,13 @@ djangorestframework==3.15.1 # eox-core drf-jwt==1.19.2 # via edx-drf-extensions -drf-yasg==1.21.7 +drf-yasg==1.21.8 # via edx-api-doc-tools edx-api-doc-tools==2.0.0 # via eox-core edx-ccx-keys==1.3.0 # via openedx-events -edx-django-utils==6.0.0 +edx-django-utils==7.0.0 # via # edx-drf-extensions # edx-rest-api-client @@ -185,14 +180,14 @@ kombu==5.4.2 # via celery lxml==5.3.0 # via xblock -mako==1.3.5 +mako==1.3.6 # via xblock markupsafe==2.1.5 # via # jinja2 # mako # xblock -newrelic==10.1.0 +newrelic==10.2.0 # via edx-django-utils oauthlib==3.2.2 # via @@ -209,7 +204,7 @@ pbr==6.1.0 # via stevedore prompt-toolkit==3.0.48 # via click-repl -psutil==6.0.0 +psutil==6.1.0 # via edx-django-utils pycparser==2.22 # via cffi @@ -241,7 +236,6 @@ python3-openid==3.2.0 # via social-auth-core pytz==2024.2 # via - # django-oauth-toolkit # drf-yasg # edx-proctoring # event-tracking diff --git a/requirements/constraints.txt b/requirements/constraints.txt index fb267bd..ced9cf4 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -12,16 +12,5 @@ # Common constraints for Open edX repos -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt -# Adding pin to avoid any major upgrade. -# 23.5. is the latest version that works with Django 3.2 -django-filter<24.1 - -# Adding pin to avoid any major upgrade. -# 3.15.1 is the latest version that works with Django 3.2 -djangorestframework<3.15.2 - -# Latest version compatible with Django 3.2 -django-oauth-toolkit==2.4.0 - # backports.zoneinfo is only needed for Python < 3.9 backports.zoneinfo; python_version<'3.9' diff --git a/requirements/django32.txt b/requirements/django32.txt deleted file mode 100644 index d296127..0000000 --- a/requirements/django32.txt +++ /dev/null @@ -1 +0,0 @@ -django==3.2.23 diff --git a/requirements/test.txt b/requirements/test.txt index 55194f8..de5bb85 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -80,7 +80,7 @@ code-annotations==1.8.0 # edx-toggles coverage==7.6.1 # via -r requirements/test.in -cryptography==43.0.1 +cryptography==43.0.3 # via # -r requirements/base.txt # jwcrypto @@ -124,9 +124,8 @@ django-crum==0.7.9 # edx-toggles django-fake-model==0.1.4 # via -r requirements/test.in -django-filter==23.5 +django-filter==24.3 # via - # -c requirements/constraints.txt # -r requirements/base.txt # -r requirements/test.in # eox-core @@ -139,9 +138,8 @@ django-model-utils==5.0.0 # -r requirements/base.txt # edx-proctoring # edx-when -django-oauth-toolkit==2.4.0 +django-oauth-toolkit==3.0.1 # via - # -c requirements/constraints.txt # -r requirements/base.txt # eox-core django-oauth2-provider==0.2.6.1 @@ -166,9 +164,8 @@ django-webpack-loader==3.1.1 # via # -r requirements/base.txt # edx-proctoring -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via - # -c requirements/constraints.txt # -r requirements/base.txt # drf-jwt # drf-yasg @@ -182,7 +179,7 @@ drf-jwt==1.19.2 # via # -r requirements/base.txt # edx-drf-extensions -drf-yasg==1.21.7 +drf-yasg==1.21.8 # via # -r requirements/base.txt # edx-api-doc-tools @@ -194,7 +191,7 @@ edx-ccx-keys==1.3.0 # via # -r requirements/base.txt # openedx-events -edx-django-utils==6.0.0 +edx-django-utils==7.0.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -284,7 +281,7 @@ lxml==5.3.0 # via # -r requirements/base.txt # xblock -mako==1.3.5 +mako==1.3.6 # via # -r requirements/base.txt # xblock @@ -298,7 +295,7 @@ mccabe==0.7.0 # via pylint mock==5.1.0 # via -r requirements/test.in -newrelic==10.1.0 +newrelic==10.2.0 # via # -r requirements/base.txt # edx-django-utils @@ -330,7 +327,7 @@ prompt-toolkit==3.0.48 # via # -r requirements/base.txt # click-repl -psutil==6.0.0 +psutil==6.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -390,7 +387,6 @@ python3-openid==3.2.0 pytz==2024.2 # via # -r requirements/base.txt - # django-oauth-toolkit # drf-yasg # edx-proctoring # event-tracking diff --git a/requirements/tox.txt b/requirements/tox.txt index 2836025..627440c 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -32,9 +32,9 @@ tomli==2.0.2 # via # pyproject-api # tox -tox==4.21.2 +tox==4.23.1 # via -r requirements/tox.in typing-extensions==4.12.2 # via tox -virtualenv==20.26.6 +virtualenv==20.27.0 # via tox diff --git a/setup.cfg b/setup.cfg index 6a40a27..0699212 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 7.3.0 +current_version = 8.0.0 commit = False tag = False diff --git a/setup.py b/setup.py index cb9ddb4..8dd6d0e 100644 --- a/setup.py +++ b/setup.py @@ -73,13 +73,11 @@ def get_version(*file_paths): author_email='contact@edunext.co', classifiers=[ 'Development Status :: 5 - Production/Stable', - 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Affero General Public License v3', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', ], packages=[ diff --git a/tox.ini b/tox.ini index bee6736..ec661d8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,15 @@ [tox] -envlist = py{38,310,311}-django{32,42} +envlist = py{38, 311}-django{42} [testenv] envdir= - # Use the same environment for all commands running under a specific python version py38: {toxworkdir}/py38 - py310: {toxworkdir}/py310 py311: {toxworkdir}/py311 passenv = TEST_INTEGRATION TEST_DATA deps = - django32: -r requirements/django32.txt django42: -r requirements/django42.txt -r requirements/test.txt commands =