From b42e142078b5842283b1389fc2938f734eba74fd Mon Sep 17 00:00:00 2001 From: magajh Date: Tue, 22 Oct 2024 09:28:39 -0400 Subject: [PATCH 1/3] chore: drop support for python 3.10 and django 3.2 --- .github/workflows/tests.yml | 4 ++-- requirements/base.txt | 11 +++++------ requirements/constraints.txt | 4 ---- requirements/django32.txt | 1 - requirements/test.txt | 11 +++++------ requirements/tox.txt | 4 ++-- tox.ini | 4 +--- 7 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 requirements/django32.txt diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5da7e968..5e3aaacb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,8 +12,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/requirements/base.txt b/requirements/base.txt index af82044b..24343e87 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -21,7 +21,7 @@ charset-normalizer==3.4.0 # via requests click==8.1.7 # via edx-django-utils -cryptography==43.0.1 +cryptography==43.0.3 # via # pyjwt # social-auth-core @@ -61,9 +61,8 @@ django-waffle==4.1.0 # via # edx-django-utils # edx-drf-extensions -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via - # -c requirements/constraints.txt # -r requirements/base.in # drf-jwt # edx-drf-extensions @@ -72,7 +71,7 @@ dnspython==2.6.1 # via pymongo drf-jwt==1.19.2 # via edx-drf-extensions -edx-django-utils==6.0.0 +edx-django-utils==7.0.0 # via edx-drf-extensions edx-drf-extensions==10.4.0 # via @@ -89,7 +88,7 @@ idna==3.10 # via requests jsonfield==3.1.0 # via -r requirements/base.in -newrelic==10.1.0 +newrelic==10.2.0 # via edx-django-utils oauthlib==3.2.2 # via @@ -101,7 +100,7 @@ pbr==6.1.0 # via stevedore pillow==10.4.0 # via edx-organizations -psutil==6.0.0 +psutil==6.1.0 # via edx-django-utils pycparser==2.22 # via cffi diff --git a/requirements/constraints.txt b/requirements/constraints.txt index e977c2a1..4cf5f2dd 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -16,10 +16,6 @@ Django<5 # backports.zoneinfo is only needed for Python < 3.9 backports.zoneinfo; python_version<'3.9' -# Adding pin to avoid any major upgrade. -# 3.15.1 is the latest version that works with Django 3.2 -djangorestframework<3.15.2 - # Versions >= 3.3.0 drop support for Python 3.8 # Ensures a consistent pylint version across all Python environments to avoid triggering varying warnings pylint<3.3.0 diff --git a/requirements/django32.txt b/requirements/django32.txt deleted file mode 100644 index 7eec28f9..00000000 --- a/requirements/django32.txt +++ /dev/null @@ -1 +0,0 @@ -django==3.2.24 diff --git a/requirements/test.txt b/requirements/test.txt index a6bae6ed..4ea101c0 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -35,7 +35,7 @@ click==8.1.7 # edx-django-utils coverage==7.6.1 # via -r requirements/test.in -cryptography==43.0.1 +cryptography==43.0.3 # via # -r requirements/base.txt # pyjwt @@ -86,9 +86,8 @@ django-waffle==4.1.0 # -r requirements/base.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via - # -c requirements/constraints.txt # -r requirements/base.txt # drf-jwt # edx-drf-extensions @@ -101,7 +100,7 @@ drf-jwt==1.19.2 # via # -r requirements/base.txt # edx-drf-extensions -edx-django-utils==6.0.0 +edx-django-utils==7.0.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -132,7 +131,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 @@ -161,7 +160,7 @@ platformdirs==4.3.6 # via pylint pluggy==1.5.0 # via pytest -psutil==6.0.0 +psutil==6.1.0 # via # -r requirements/base.txt # edx-django-utils diff --git a/requirements/tox.txt b/requirements/tox.txt index 28360259..627440c7 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/tox.ini b/tox.ini index 820c3f72..bde51548 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,14 @@ [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 deps = - django32: -r requirements/django32.txt django42: -r requirements/django42.txt -r requirements/test.txt commands = From 1c0335da333cbd386bc936ba10153a065d229781 Mon Sep 17 00:00:00 2001 From: magajh Date: Tue, 22 Oct 2024 11:42:32 -0400 Subject: [PATCH 2/3] chore: update setup classifiers --- setup.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup.py b/setup.py index 9bb40f91..0e36d3d6 100644 --- a/setup.py +++ b/setup.py @@ -39,16 +39,11 @@ def get_version(): packages=['eox_tenant'], classifiers=[ 'Development Status :: 5 - Production/Stable', - 'Framework :: Django :: 2.2', - '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', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', ], license='AGPL', From 53c21e38b0b275963b3ab4187105a71af166113c Mon Sep 17 00:00:00 2001 From: magajh Date: Tue, 22 Oct 2024 13:36:20 -0400 Subject: [PATCH 3/3] chore: update changelog, readme and bump version to 12.0.0 --- CHANGELOG.md | 6 ++++++ README.rst | 46 +++++++++++++++++++++--------------------- eox_tenant/__init__.py | 2 +- setup.cfg | 2 +- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb53c6ac..09e07a86 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). +## [v12.0.0](https://github.com/eduNEXT/eox-tenant/compare/v11.7.0...v12.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. + ## [v11.7.0](https://github.com/eduNEXT/eox-tenant/compare/v11.6.0...v11.7.0) - (2024-06-19) ### Added diff --git a/README.rst b/README.rst index c7a1b981..92da05d9 100644 --- a/README.rst +++ b/README.rst @@ -44,29 +44,29 @@ Add ``EDNX_USE_SIGNAL = True`` in each microsite/tenant that wants to use the pl Compatibility Notes -------------------- -+------------------+-----------------+ -| Open edX Release | Version | -+==================+=================+ -| Ironwood | < 3.0 | -+------------------+-----------------+ -| Juniper | >= 3.0 < 4.0 | -+------------------+-----------------+ -| Koa | >= 4.0 <= 5.1.3 | -+------------------+-----------------+ -| Lilac | >= 4.0 < 6.2 | -+------------------+-----------------+ -| Maple | >= 6.0 | -+------------------+-----------------+ -| Nutmeg | >= 6.2 | -+------------------+-----------------+ -| Olive | >= 8.0 | -+------------------+-----------------+ -| Palm | >= v11.7.0 | -+------------------+-----------------+ -| Quince | >= v11.7.0 | -+------------------+-----------------+ -| Redwood | >= v11.7.0 | -+------------------+-----------------+ ++------------------+------------------+ +| Open edX Release | Version | ++==================+==================+ +| Ironwood | < 3.0 | ++------------------+------------------+ +| Juniper | >= 3.0 < 4.0 | ++------------------+------------------+ +| Koa | >= 4.0 <= 5.1.3 | ++------------------+------------------+ +| Lilac | >= 4.0 < 6.2 | ++------------------+------------------+ +| Maple | >= 6.0 < 12.0 | ++------------------+------------------+ +| Nutmeg | >= 6.2 < 12.0 | ++------------------+------------------+ +| Olive | >= 8.0 < 12.0 | ++------------------+------------------+ +| Palm | >= v11.7.0 < 12.0| ++------------------+------------------+ +| Quince | >= v11.7.0 | ++------------------+------------------+ +| Redwood | >= v11.7.0 | ++------------------+------------------+ ⚠️ Since the 6.2 version, eox-tenant does not support Django 2.2 diff --git a/eox_tenant/__init__.py b/eox_tenant/__init__.py index 4faa7681..3a51f942 100644 --- a/eox_tenant/__init__.py +++ b/eox_tenant/__init__.py @@ -1,4 +1,4 @@ """ Init for eox-tenant. """ -__version__ = '11.7.0' +__version__ = '12.0.0' diff --git a/setup.cfg b/setup.cfg index ea59a22a..2b14c5d7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 11.7.0 +current_version = 12.0.0 commit = False tag = False