From 5222d7b4db1c72c99d574667846ce0d0b30eb0a9 Mon Sep 17 00:00:00 2001 From: Igor Melnyk Date: Wed, 21 Aug 2024 19:01:57 +0300 Subject: [PATCH] Release 1.3 --- .github/workflows/test.yml | 134 ++++++++++++++++++------------------- .gitignore | 4 ++ CHANGELOG.md | 5 ++ README.rst | 10 ++- requirements.txt | 2 +- setup.py | 2 +- 6 files changed, 86 insertions(+), 71 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 741387e..49d88d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,31 +7,31 @@ 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 - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout tcp server - uses: actions/checkout@v3 + 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@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VER }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-pip with: @@ -44,11 +44,11 @@ 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 - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-npm with: @@ -71,28 +71,28 @@ 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 - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout tcp server - uses: actions/checkout@v3 + 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@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VER }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-pip with: @@ -105,11 +105,11 @@ 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 - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-npm with: @@ -132,28 +132,28 @@ 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 - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout tcp server - uses: actions/checkout@v3 + 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@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VER }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-pip with: @@ -166,11 +166,11 @@ 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 - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-npm with: @@ -193,28 +193,28 @@ 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 - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout tcp server - uses: actions/checkout@v3 + 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@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VER }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-pip with: @@ -227,11 +227,11 @@ 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 - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-npm with: @@ -254,28 +254,28 @@ 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 - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout tcp server - uses: actions/checkout@v3 + 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@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VER }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-pip with: @@ -288,11 +288,11 @@ 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 - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-npm with: @@ -315,28 +315,28 @@ 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 - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout tcp server - uses: actions/checkout@v3 + 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@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VER }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-pip with: @@ -349,11 +349,11 @@ 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 - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-npm with: @@ -376,28 +376,28 @@ 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 - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout tcp server - uses: actions/checkout@v3 + 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@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VER }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-pip with: @@ -410,11 +410,11 @@ 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 - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-npm with: diff --git a/.gitignore b/.gitignore index 2efc56f..020f958 100644 --- 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 index 4b0ca95..8786a98 100644 --- 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 index 86f008d..a1d62d2 100644 --- 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 index 89640c5..5744393 100644 --- 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 index b24bbb3..cf25a4e 100644 --- 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': [