Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 65 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
run: |
python tools.py test
test-py-3-7:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # Python 3.7 is not available in newer releases
env:
PYTHON_VER: 3.7
NODE_VER: 20.x
Expand Down Expand Up @@ -257,7 +257,7 @@ jobs:
NODE_VER: 20.x
strategy:
matrix:
django-ver: [ '<3.3', '<4.1', '<4.2', '<4.3', '<5.2' ]
django-ver: [ '<3.3', '<4.1', '<4.2', '<4.3', '<5.2', '<5.3' ]
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' ]
tcp-server-ver: [ 'v1.2' ]
fail-fast: false
Expand Down Expand Up @@ -318,7 +318,7 @@ jobs:
NODE_VER: 20.x
strategy:
matrix:
django-ver: [ '<4.2', '<4.3', '<5.2' ]
django-ver: [ '<4.2', '<4.3', '<5.2', '<5.3' ]
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' ]
tcp-server-ver: [ 'v1.2' ]
fail-fast: false
Expand Down Expand Up @@ -379,7 +379,68 @@ jobs:
NODE_VER: 20.x
strategy:
matrix:
django-ver: [ '<4.3', '<5.2' ]
django-ver: [ '<4.3', '<5.2', '<5.3' ]
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' ]
tcp-server-ver: [ 'v1.2' ]
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Checkout tcp server
uses: actions/checkout@v4
with:
repository: 'liminspace/mjml-tcpserver'
ref: ${{ matrix.tcp-server-ver }}
path: './mjml-tcpserver'
- name: Set up Python ${{ env.PYTHON_VER }}
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VER }}
- name: Cache pip
uses: actions/cache@v4
env:
cache-name: cache-pip
with:
path: ~/.cache/pip
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-${{ matrix.django-ver }}
restore-keys: |
${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-
- name: Install Python dependencies
run: |
pip install "Django${{ matrix.django-ver }}"
pip install "requests>=2.24.0,<=2.29.0"
- name: Set up Node.js ${{ env.NODE_VER }}
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VER }}
- name: Cache npm
uses: actions/cache@v4
env:
cache-name: cache-npm
with:
path: ~/.npm
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-${{ matrix.mjml-ver }}
restore-keys: |
${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-
- name: Install Node dependencies
run: |
npm cache verify
npm install -g mjml-http-server@0.1.0
npm install mjml@${{ matrix.mjml-ver }}
- name: Show info
run: |
node_modules/.bin/mjml --version
- name: Test
run: |
python tools.py test
test-py-3-13:
runs-on: ubuntu-latest
env:
PYTHON_VER: '3.13'
NODE_VER: 20.x
strategy:
matrix:
django-ver: [ '<5.2', '<5.3' ]
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' ]
tcp-server-ver: [ 'v1.2' ]
fail-fast: false
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
1.4 (2025-04-06)
================
* Added supporting Django 5.2
* Added Python 3.13 in tests


1.3 (2024-08-21)
================
* Added supporting Django 5.1
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Installation
Requirements:
^^^^^^^^^^^^^

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

Expand Down
2 changes: 1 addition & 1 deletion mjml/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import django

__version__ = '1.3'
__version__ = '1.4'

if django.VERSION < (3, 2):
default_app_config = 'mjml.apps.MJMLConfig'
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
wheel==0.37.1
twine==3.8.0
coverage==6.2
django>=2.2,<5.2
django>=2.2,<5.3
requests>=2.24.0,<2.29.0
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
platforms=['OS Independent'],
python_requires='>=3.6',
install_requires=[
'django >=2.2,<5.2',
'django >=2.2,<5.3',
],
extras_require={
'requests': [
Expand All @@ -40,6 +40,7 @@
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Intended Audience :: Developers',
'Topic :: Software Development :: Libraries',
'Topic :: Software Development :: Libraries :: Application Frameworks',
Expand Down