Skip to content

Commit

Permalink
chore: drop support for python 3.10 and django 3.2 (#222)
Browse files Browse the repository at this point in the history
* chore: drop support for python 3.10 and django 3.2

* chore: update setup classifiers

* chore: update changelog, readme and bump version to 12.0.0
  • Loading branch information
magajh authored Oct 28, 2024
1 parent 86f68f8 commit b160948
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 54 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
46 changes: 23 additions & 23 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion eox_tenant/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
Init for eox-tenant.
"""
__version__ = '11.7.0'
__version__ = '12.0.0'
11 changes: 5 additions & 6 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion requirements/django32.txt

This file was deleted.

11 changes: 5 additions & 6 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 11.7.0
current_version = 12.0.0
commit = False
tag = False

Expand Down
5 changes: 0 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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 =
Expand Down

0 comments on commit b160948

Please sign in to comment.