Skip to content

Commit 723d63b

Browse files
committed
* Added supporting Django 5.2
* Added Python 3.13 in tests
1 parent e6a170c commit 723d63b

File tree

6 files changed

+76
-8
lines changed

6 files changed

+76
-8
lines changed

.github/workflows/test.yml

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
run: |
6969
python tools.py test
7070
test-py-3-7:
71-
runs-on: ubuntu-latest
71+
runs-on: ubuntu-22.04 # Python 3.7 is not available in newer releases
7272
env:
7373
PYTHON_VER: 3.7
7474
NODE_VER: 20.x
@@ -257,7 +257,7 @@ jobs:
257257
NODE_VER: 20.x
258258
strategy:
259259
matrix:
260-
django-ver: [ '<3.3', '<4.1', '<4.2', '<4.3', '<5.2' ]
260+
django-ver: [ '<3.3', '<4.1', '<4.2', '<4.3', '<5.2', '<5.3' ]
261261
mjml-ver: [ '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1', '4.15.2' ]
262262
tcp-server-ver: [ 'v1.2' ]
263263
fail-fast: false
@@ -318,7 +318,7 @@ jobs:
318318
NODE_VER: 20.x
319319
strategy:
320320
matrix:
321-
django-ver: [ '<4.2', '<4.3', '<5.2' ]
321+
django-ver: [ '<4.2', '<4.3', '<5.2', '<5.3' ]
322322
mjml-ver: [ '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1', '4.15.2' ]
323323
tcp-server-ver: [ 'v1.2' ]
324324
fail-fast: false
@@ -379,7 +379,68 @@ jobs:
379379
NODE_VER: 20.x
380380
strategy:
381381
matrix:
382-
django-ver: [ '<4.3', '<5.2' ]
382+
django-ver: [ '<4.3', '<5.2', '<5.3' ]
383+
mjml-ver: [ '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1', '4.15.2' ]
384+
tcp-server-ver: [ 'v1.2' ]
385+
fail-fast: false
386+
steps:
387+
- name: Checkout
388+
uses: actions/checkout@v4
389+
- name: Checkout tcp server
390+
uses: actions/checkout@v4
391+
with:
392+
repository: 'liminspace/mjml-tcpserver'
393+
ref: ${{ matrix.tcp-server-ver }}
394+
path: './mjml-tcpserver'
395+
- name: Set up Python ${{ env.PYTHON_VER }}
396+
uses: actions/setup-python@v5
397+
with:
398+
python-version: ${{ env.PYTHON_VER }}
399+
- name: Cache pip
400+
uses: actions/cache@v4
401+
env:
402+
cache-name: cache-pip
403+
with:
404+
path: ~/.cache/pip
405+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-${{ matrix.django-ver }}
406+
restore-keys: |
407+
${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-
408+
- name: Install Python dependencies
409+
run: |
410+
pip install "Django${{ matrix.django-ver }}"
411+
pip install "requests>=2.24.0,<=2.29.0"
412+
- name: Set up Node.js ${{ env.NODE_VER }}
413+
uses: actions/setup-node@v4
414+
with:
415+
node-version: ${{ env.NODE_VER }}
416+
- name: Cache npm
417+
uses: actions/cache@v4
418+
env:
419+
cache-name: cache-npm
420+
with:
421+
path: ~/.npm
422+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-${{ matrix.mjml-ver }}
423+
restore-keys: |
424+
${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-
425+
- name: Install Node dependencies
426+
run: |
427+
npm cache verify
428+
npm install -g mjml-http-server@0.1.0
429+
npm install mjml@${{ matrix.mjml-ver }}
430+
- name: Show info
431+
run: |
432+
node_modules/.bin/mjml --version
433+
- name: Test
434+
run: |
435+
python tools.py test
436+
test-py-3-13:
437+
runs-on: ubuntu-latest
438+
env:
439+
PYTHON_VER: '3.13'
440+
NODE_VER: 20.x
441+
strategy:
442+
matrix:
443+
django-ver: [ '<5.2', '<5.3' ]
383444
mjml-ver: [ '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1', '4.15.2' ]
384445
tcp-server-ver: [ 'v1.2' ]
385446
fail-fast: false

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.4 (2025-04-06)
2+
================
3+
* Added supporting Django 5.2
4+
* Added Python 3.13 in tests
5+
6+
17
1.3 (2024-08-21)
28
================
39
* Added supporting Django 5.1

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Installation
3131
Requirements:
3232
^^^^^^^^^^^^^
3333

34-
* ``Django`` from 2.2 to 5.1
34+
* ``Django`` from 2.2 to 5.2
3535
* ``requests`` from 2.24.0 (only if you are going to use API HTTP-server for rendering)
3636
* ``mjml`` from 4.7.1 to 4.15.2 (older version may work, but not tested anymore)
3737

mjml/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import django
22

3-
__version__ = '1.3'
3+
__version__ = '1.4'
44

55
if django.VERSION < (3, 2):
66
default_app_config = 'mjml.apps.MJMLConfig'

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
wheel==0.37.1
22
twine==3.8.0
33
coverage==6.2
4-
django>=2.2,<5.2
4+
django>=2.2,<5.3
55
requests>=2.24.0,<2.29.0

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
platforms=['OS Independent'],
1919
python_requires='>=3.6',
2020
install_requires=[
21-
'django >=2.2,<5.2',
21+
'django >=2.2,<5.3',
2222
],
2323
extras_require={
2424
'requests': [
@@ -40,6 +40,7 @@
4040
'Programming Language :: Python :: 3.10',
4141
'Programming Language :: Python :: 3.11',
4242
'Programming Language :: Python :: 3.12',
43+
'Programming Language :: Python :: 3.13',
4344
'Intended Audience :: Developers',
4445
'Topic :: Software Development :: Libraries',
4546
'Topic :: Software Development :: Libraries :: Application Frameworks',

0 commit comments

Comments
 (0)