Skip to content

Commit

Permalink
chore: drop support for python 3.10 and django 3.2 (#68)
Browse files Browse the repository at this point in the history
  • Loading branch information
magajh authored Oct 28, 2024
1 parent 7c116b7 commit 8d1389b
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ 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 - 2024-10-22

## [v8.0.0](https://github.com/eduNEXT/eox-theming/compare/v7.2.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.2.0 - 2024-07-24

### Changed
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
grep -e "^django==" requirements/test.txt > requirements/django42.txt
sed '/^[dD]jango==/d;' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt

Expand Down
42 changes: 21 additions & 21 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,27 @@ The plugin conducts a hierarchical search for the requested template. It begins
Compatibility Notes
===================

+------------------+--------------+
| Open edX Release | Version |
+==================+==============+
| Juniper | >= 1.0 < 2.0 |
+------------------+--------------+
| Koa | >= 2.0 < 3.0 |
+------------------+--------------+
| Lilac | >= 2.0 |
+------------------+--------------+
| Maple | >= 3.0 |
+------------------+--------------+
| Nutmeg | >= 4.0 |
+------------------+--------------+
| Olive | >= 5.0 |
+------------------+--------------+
| Palm | >= 6.0 |
+------------------+--------------+
| Quince | >= 7.0 |
+------------------+--------------+
| Redwood | >= 7.2.0 |
+------------------+--------------+
+------------------+---------------+
| Open edX Release | Version |
+==================+===============+
| Juniper | >= 1.0 < 2.0 |
+------------------+---------------+
| Koa | >= 2.0 < 3.0 |
+------------------+---------------+
| Lilac | >= 2.0 < 8.0 |
+------------------+---------------+
| Maple | >= 3.0 < 8.0 |
+------------------+---------------+
| Nutmeg | >= 4.0 < 8.0 |
+------------------+---------------+
| Olive | >= 5.0 < 8.0 |
+------------------+---------------+
| Palm | >= 6.0 < 8.0 |
+------------------+---------------+
| Quince | >= 7.0 |
+------------------+---------------+
| Redwood | >= 7.2.0 |
+------------------+---------------+

⚠️ From Lilac version Django 2.2 is not supported, you should use Django 3.2 and eox-tenant >=4.0.

Expand Down
2 changes: 1 addition & 1 deletion eox_theming/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

from __future__ import unicode_literals

__version__ = '7.2.0'
__version__ = '8.0.0'
4 changes: 0 additions & 4 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,3 @@

# 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
1 change: 0 additions & 1 deletion requirements/django32.txt

This file was deleted.

8 changes: 3 additions & 5 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@ dill==0.3.9
# -r requirements/base.txt
# -r requirements/test.in
# djangorestframework
djangorestframework==3.15.1
# via
# -c requirements/constraints.txt
# -r requirements/test.in
djangorestframework==3.15.2
# via -r requirements/test.in
eox-tenant==11.7.0
# via -r requirements/base.txt
exceptiongroup==1.2.2
Expand All @@ -45,7 +43,7 @@ iniconfig==2.0.0
# via pytest
isort==5.13.2
# via pylint
mako==1.3.5
mako==1.3.6
# via -r requirements/test.in
markupsafe==2.1.5
# via mako
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 = 7.2.0
current_version = 8.0.0
commit = False
tag = False

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,11 @@ def is_requirement(line):
],
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',
],
license='AGPL',
Expand Down
5 changes: 1 addition & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
[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 8d1389b

Please sign in to comment.