Skip to content

Commit 02cc033

Browse files
liminspaceliminspace
authored
Release 1.2
 * Added Python 3.12 in tests * Added supporting Django 5.0
1 parent 701629c commit 02cc033

File tree

6 files changed

+87
-16
lines changed

6 files changed

+87
-16
lines changed

‎.github/workflows/test.yml‎

Lines changed: 71 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3' ]
17-
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.0' ]
17+
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1' ]
1818
tcp-server-ver: [ 'v1.1' ]
1919
fail-fast: false
2020
steps:
@@ -75,7 +75,7 @@ jobs:
7575
strategy:
7676
matrix:
7777
django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3' ]
78-
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.0' ]
78+
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1' ]
7979
tcp-server-ver: [ 'v1.1' ]
8080
fail-fast: false
8181
steps:
@@ -135,8 +135,8 @@ jobs:
135135
NODE_VER: 14
136136
strategy:
137137
matrix:
138-
django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3', '<4.1', '<4.2' ]
139-
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.0' ]
138+
django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3', '<4.1', '<4.2', '<4.3' ]
139+
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1' ]
140140
tcp-server-ver: [ 'v1.1' ]
141141
fail-fast: false
142142
steps:
@@ -196,8 +196,8 @@ jobs:
196196
NODE_VER: 14
197197
strategy:
198198
matrix:
199-
django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3', '<4.1', '<4.2' ]
200-
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.0' ]
199+
django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3', '<4.1', '<4.2', '<4.3' ]
200+
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1' ]
201201
tcp-server-ver: [ 'v1.1' ]
202202
fail-fast: false
203203
steps:
@@ -257,8 +257,8 @@ jobs:
257257
NODE_VER: 14
258258
strategy:
259259
matrix:
260-
django-ver: [ '<3.3', '<4.1', '<4.2', '<4.3' ]
261-
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.0' ]
260+
django-ver: [ '<3.3', '<4.1', '<4.2', '<4.3', '<5.1' ]
261+
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1' ]
262262
tcp-server-ver: [ 'v1.1' ]
263263
fail-fast: false
264264
steps:
@@ -318,8 +318,69 @@ jobs:
318318
NODE_VER: 14
319319
strategy:
320320
matrix:
321-
django-ver: [ '<4.2', '<4.3' ]
322-
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.0' ]
321+
django-ver: [ '<4.2', '<4.3', '<5.1' ]
322+
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1' ]
323+
tcp-server-ver: [ 'v1.1' ]
324+
fail-fast: false
325+
steps:
326+
- name: Checkout
327+
uses: actions/checkout@v3
328+
- name: Checkout tcp server
329+
uses: actions/checkout@v3
330+
with:
331+
repository: 'liminspace/mjml-tcpserver'
332+
ref: ${{ matrix.tcp-server-ver }}
333+
path: './mjml-tcpserver'
334+
- name: Set up Python ${{ env.PYTHON_VER }}
335+
uses: actions/setup-python@v4
336+
with:
337+
python-version: ${{ env.PYTHON_VER }}
338+
- name: Cache pip
339+
uses: actions/cache@v3
340+
env:
341+
cache-name: cache-pip
342+
with:
343+
path: ~/.cache/pip
344+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-${{ matrix.django-ver }}
345+
restore-keys: |
346+
${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-
347+
- name: Install Python dependencies
348+
run: |
349+
pip install "Django${{ matrix.django-ver }}"
350+
pip install "requests>=2.24.0,<=2.29.0"
351+
- name: Set up Node.js ${{ env.NODE_VER }}
352+
uses: actions/setup-node@v3
353+
with:
354+
node-version: ${{ env.NODE_VER }}
355+
- name: Cache npm
356+
uses: actions/cache@v3
357+
env:
358+
cache-name: cache-npm
359+
with:
360+
path: ~/.npm
361+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-${{ matrix.mjml-ver }}
362+
restore-keys: |
363+
${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-
364+
- name: Install Node dependencies
365+
run: |
366+
npm cache verify
367+
npm install -g mjml-http-server@0.1.0
368+
npm install mjml@${{ matrix.mjml-ver }}
369+
- name: Show info
370+
run: |
371+
node_modules/.bin/mjml --version
372+
- name: Test
373+
run: |
374+
python tools.py test
375+
test-py-3-12:
376+
runs-on: ubuntu-latest
377+
env:
378+
PYTHON_VER: '3.12'
379+
NODE_VER: 14
380+
strategy:
381+
matrix:
382+
django-ver: [ '<4.3', '<5.1' ]
383+
mjml-ver: [ '4.6.3', '4.7.1', '4.8.2', '4.9.3', '4.10.4', '4.11.0', '4.12.0', '4.13.0', '4.14.1' ]
323384
tcp-server-ver: [ 'v1.1' ]
324385
fail-fast: false
325386
steps:

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.2 (2024-01-08)
2+
================
3+
* Added Python 3.12 in tests
4+
* Added supporting Django 5.0
5+
6+
17
1.1 (2023-04-11)
28
================
39
* Added Python 3.11 in tests

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ Installation
2525
Requirements:
2626
^^^^^^^^^^^^^
2727

28-
* ``Django`` from 2.2 to 4.2
28+
* ``Django`` from 2.2 to 5.0
2929
* ``requests`` from 2.24.0 (only if you are going to use API HTTP-server for rendering)
30-
* ``mjml`` from 3.6.3 to 4.14.0
30+
* ``mjml`` from 3.6.3 to 4.14.1
3131

3232
**\1\. Install** ``mjml``.
3333

‎mjml/__init__.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
__version__ = '1.1'
1+
import django
22

3-
default_app_config = 'mjml.apps.MJMLConfig'
3+
__version__ = '1.2'
4+
5+
if django.VERSION < (3, 2):
6+
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,<4.2
4+
django>=2.2,<5.1
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.0',
21+
'django >=2.2,<5.1',
2222
],
2323
extras_require={
2424
'requests': [
@@ -39,6 +39,7 @@
3939
'Programming Language :: Python :: 3.9',
4040
'Programming Language :: Python :: 3.10',
4141
'Programming Language :: Python :: 3.11',
42+
'Programming Language :: Python :: 3.12',
4243
'Intended Audience :: Developers',
4344
'Topic :: Software Development :: Libraries',
4445
'Topic :: Software Development :: Libraries :: Application Frameworks',

0 commit comments

Comments
 (0)