Release 1.3

liminspace · Aug 21, 2024 · 902b078 · 902b078
1 parent 02cc033
commit 902b078
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 36 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,15 +7,15 @@ on:
 
 jobs:
  test-py-3-6:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-20.04 # Python 3.6 is not available in newer releases
  env:
  PYTHON_VER: 3.6
- NODE_VER: 14
+ NODE_VER: 20.x
  strategy:
  matrix:
  django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3' ]
- 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' ]
- tcp-server-ver: [ 'v1.1' ]
+ 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
@@ -44,7 +44,7 @@ jobs:
  pip install "Django${{ matrix.django-ver }}"
  pip install "requests>=2.24.0,<2.28.0"
  - name: Set up Node.js ${{ env.NODE_VER }}
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ env.NODE_VER }}
  - name: Cache npm
@@ -71,12 +71,12 @@ jobs:
  runs-on: ubuntu-latest
  env:
  PYTHON_VER: 3.7
- NODE_VER: 14
+ NODE_VER: 20.x
  strategy:
  matrix:
  django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3' ]
- 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' ]
- tcp-server-ver: [ 'v1.1' ]
+ 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
@@ -105,7 +105,7 @@ jobs:
  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@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ env.NODE_VER }}
  - name: Cache npm
@@ -132,12 +132,12 @@ jobs:
  runs-on: ubuntu-latest
  env:
  PYTHON_VER: 3.8
- NODE_VER: 14
+ NODE_VER: 20.x
  strategy:
  matrix:
  django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3', '<4.1', '<4.2', '<4.3' ]
- 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' ]
- tcp-server-ver: [ 'v1.1' ]
+ 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
@@ -166,7 +166,7 @@ jobs:
  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@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ env.NODE_VER }}
  - name: Cache npm
@@ -193,12 +193,12 @@ jobs:
  runs-on: ubuntu-latest
  env:
  PYTHON_VER: 3.9
- NODE_VER: 14
+ NODE_VER: 20.x
  strategy:
  matrix:
  django-ver: [ '<2.3', '<3.1', '<3.2', '<3.3', '<4.1', '<4.2', '<4.3' ]
- 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' ]
- tcp-server-ver: [ 'v1.1' ]
+ 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
@@ -227,7 +227,7 @@ jobs:
  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@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ env.NODE_VER }}
  - name: Cache npm
@@ -254,12 +254,12 @@ jobs:
  runs-on: ubuntu-latest
  env:
  PYTHON_VER: '3.10'
- NODE_VER: 14
+ NODE_VER: 20.x
  strategy:
  matrix:
- django-ver: [ '<3.3', '<4.1', '<4.2', '<4.3', '<5.1' ]
- 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' ]
- tcp-server-ver: [ 'v1.1' ]
+ django-ver: [ '<3.3', '<4.1', '<4.2', '<4.3', '<5.2' ]
+ 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
@@ -288,7 +288,7 @@ jobs:
  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@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ env.NODE_VER }}
  - name: Cache npm
@@ -315,12 +315,12 @@ jobs:
  runs-on: ubuntu-latest
  env:
  PYTHON_VER: '3.11'
- NODE_VER: 14
+ NODE_VER: 20.x
  strategy:
  matrix:
- django-ver: [ '<4.2', '<4.3', '<5.1' ]
- 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' ]
- tcp-server-ver: [ 'v1.1' ]
+ django-ver: [ '<4.2', '<4.3', '<5.2' ]
+ 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
@@ -349,7 +349,7 @@ jobs:
  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@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ env.NODE_VER }}
  - name: Cache npm
@@ -376,12 +376,12 @@ jobs:
  runs-on: ubuntu-latest
  env:
  PYTHON_VER: '3.12'
- NODE_VER: 14
+ NODE_VER: 20.x
  strategy:
  matrix:
- django-ver: [ '<4.3', '<5.1' ]
- 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' ]
- tcp-server-ver: [ 'v1.1' ]
+ django-ver: [ '<4.3', '<5.2' ]
+ 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
@@ -410,7 +410,7 @@ jobs:
  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@v3
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ env.NODE_VER }}
  - name: Cache npm

diff --git a/.gitignore b/.gitignore
@@ -73,3 +73,7 @@ tests/db.sqlite3
 node_modules/
 package-lock.json
 package.json
+
+
+# tcpserver
+mjml-tcpserver/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+1.3 (2024-08-21)
+================
+ * Added supporting Django 5.1
+
+
 1.2 (2024-01-08)
 ================
  * Added Python 3.12 in tests

diff --git a/README.rst b/README.rst
@@ -1,3 +1,9 @@
+.. image:: https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner-direct-single.svg
+ :target: https://stand-with-ukraine.pp.ua
+ :alt: Stand With Ukraine
+
+|
+
 .. image:: https://github.com/liminspace/django-mjml/actions/workflows/test.yml/badge.svg?branch=main
  :target: https://github.com/liminspace/django-mjml/actions/workflows/test.yml
  :alt: test
@@ -25,9 +31,9 @@ Installation
 Requirements:
 ^^^^^^^^^^^^^
 
-* ``Django`` from 2.2 to 5.0
+* ``Django`` from 2.2 to 5.1
 * ``requests`` from 2.24.0 (only if you are going to use API HTTP-server for rendering)
-* ``mjml`` from 3.6.3 to 4.14.1
+* ``mjml`` from 4.7.1 to 4.15.2 (older version may work, but not tested anymore)
 
 **\1\. Install** ``mjml``.
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 wheel==0.37.1
 twine==3.8.0
 coverage==6.2
-django>=2.2,<5.1
+django>=2.2,<5.2
 requests>=2.24.0,<2.29.0
diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
  platforms=['OS Independent'],
  python_requires='>=3.6',
  install_requires=[
- 'django >=2.2,<5.1',
+ 'django >=2.2,<5.2',
  ],
  extras_require={
  'requests': [