Skip to content

Commit 6f50d0b

Browse files
liminspaceliminspace
authored
Release 0.12.0 (#156)
 * Added supporting Django 4.0 * Upgraded MJML to 4.11.0 in dockerfile * Added Python 3.10 in tests * Added MJML 4.11.0 in tests * Removed MJML 4.4.0 from tests
1 parent 5b940b3 commit 6f50d0b

File tree

8 files changed

+180
-25
lines changed

8 files changed

+180
-25
lines changed

‎.github/workflows/test.yml‎

Lines changed: 156 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
types: [opened, synchronize]
77

88
jobs:
9-
test-py27:
9+
test-py-2-7:
1010
runs-on: ubuntu-latest
1111
env:
1212
PYTHON_VER: 2.7
1313
NODE_VER: 14
1414
strategy:
1515
matrix:
1616
django-ltver: [1.9, '1.10', 1.11, 1.12]
17-
mjml-ver: [4.4.0, 4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.1]
17+
mjml-ver: [4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.3, '4.11.0']
1818
fail-fast: false
1919
steps:
2020
- name: Checkout
@@ -23,6 +23,15 @@ jobs:
2323
uses: actions/setup-python@v2
2424
with:
2525
python-version: ${{ env.PYTHON_VER }}
26+
- name: Cache pip
27+
uses: actions/cache@v2
28+
env:
29+
cache-name: cache-pip
30+
with:
31+
path: ~/.cache/pip
32+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-${{ matrix.django-ltver }}
33+
restore-keys: |
34+
${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-
2635
- name: Install Python dependencies
2736
run: |
2837
pip install "Django<${{ matrix.django-ltver }}"
@@ -32,6 +41,15 @@ jobs:
3241
uses: actions/setup-node@v2
3342
with:
3443
node-version: ${{ env.NODE_VER }}
44+
- name: Cache npm
45+
uses: actions/cache@v2
46+
env:
47+
cache-name: cache-npm
48+
with:
49+
path: ~/.npm
50+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-${{ matrix.mjml-ver }}
51+
restore-keys: |
52+
${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-
3553
- name: Install Node dependencies
3654
run: |
3755
npm cache verify
@@ -43,15 +61,15 @@ jobs:
4361
- name: Test
4462
run: |
4563
python tools.py test
46-
test-py36:
64+
test-py-3-6:
4765
runs-on: ubuntu-latest
4866
env:
4967
PYTHON_VER: 3.6
5068
NODE_VER: 14
5169
strategy:
5270
matrix:
5371
django-ltver: [1.12, 2.1, 2.2, 2.3, 3.1, 3.2, 3.3]
54-
mjml-ver: [4.4.0, 4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.1]
72+
mjml-ver: [4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.3, '4.11.0']
5573
fail-fast: false
5674
steps:
5775
- name: Checkout
@@ -60,6 +78,15 @@ jobs:
6078
uses: actions/setup-python@v2
6179
with:
6280
python-version: ${{ env.PYTHON_VER }}
81+
- name: Cache pip
82+
uses: actions/cache@v2
83+
env:
84+
cache-name: cache-pip
85+
with:
86+
path: ~/.cache/pip
87+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-${{ matrix.django-ltver }}
88+
restore-keys: |
89+
${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-
6390
- name: Install Python dependencies
6491
run: |
6592
pip install "Django<${{ matrix.django-ltver }}"
@@ -68,6 +95,15 @@ jobs:
6895
uses: actions/setup-node@v2
6996
with:
7097
node-version: ${{ env.NODE_VER }}
98+
- name: Cache npm
99+
uses: actions/cache@v2
100+
env:
101+
cache-name: cache-npm
102+
with:
103+
path: ~/.npm
104+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-${{ matrix.mjml-ver }}
105+
restore-keys: |
106+
${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-
71107
- name: Install Node dependencies
72108
run: |
73109
npm cache verify
@@ -79,15 +115,15 @@ jobs:
79115
- name: Test
80116
run: |
81117
python tools.py test
82-
test-py37:
118+
test-py-3-7:
83119
runs-on: ubuntu-latest
84120
env:
85121
PYTHON_VER: 3.7
86122
NODE_VER: 14
87123
strategy:
88124
matrix:
89125
django-ltver: [1.12, 2.1, 2.2, 2.3, 3.1, 3.2, 3.3]
90-
mjml-ver: [4.4.0, 4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.1]
126+
mjml-ver: [4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.3, '4.11.0']
91127
fail-fast: false
92128
steps:
93129
- name: Checkout
@@ -96,6 +132,15 @@ jobs:
96132
uses: actions/setup-python@v2
97133
with:
98134
python-version: ${{ env.PYTHON_VER }}
135+
- name: Cache pip
136+
uses: actions/cache@v2
137+
env:
138+
cache-name: cache-pip
139+
with:
140+
path: ~/.cache/pip
141+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-${{ matrix.django-ltver }}
142+
restore-keys: |
143+
${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-
99144
- name: Install Python dependencies
100145
run: |
101146
pip install "Django<${{ matrix.django-ltver }}"
@@ -104,6 +149,15 @@ jobs:
104149
uses: actions/setup-node@v2
105150
with:
106151
node-version: ${{ env.NODE_VER }}
152+
- name: Cache npm
153+
uses: actions/cache@v2
154+
env:
155+
cache-name: cache-npm
156+
with:
157+
path: ~/.npm
158+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-${{ matrix.mjml-ver }}
159+
restore-keys: |
160+
${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-
107161
- name: Install Node dependencies
108162
run: |
109163
npm cache verify
@@ -115,15 +169,15 @@ jobs:
115169
- name: Test
116170
run: |
117171
python tools.py test
118-
test-py38:
172+
test-py-3-8:
119173
runs-on: ubuntu-latest
120174
env:
121175
PYTHON_VER: 3.8
122176
NODE_VER: 14
123177
strategy:
124178
matrix:
125-
django-ltver: [2.3, 3.1, 3.2, 3.3]
126-
mjml-ver: [4.4.0, 4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.1]
179+
django-ltver: [2.3, 3.1, 3.2, 3.3, 4.1]
180+
mjml-ver: [4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.3, '4.11.0']
127181
fail-fast: false
128182
steps:
129183
- name: Checkout
@@ -132,6 +186,15 @@ jobs:
132186
uses: actions/setup-python@v2
133187
with:
134188
python-version: ${{ env.PYTHON_VER }}
189+
- name: Cache pip
190+
uses: actions/cache@v2
191+
env:
192+
cache-name: cache-pip
193+
with:
194+
path: ~/.cache/pip
195+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-${{ matrix.django-ltver }}
196+
restore-keys: |
197+
${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-
135198
- name: Install Python dependencies
136199
run: |
137200
pip install "Django<${{ matrix.django-ltver }}"
@@ -140,6 +203,15 @@ jobs:
140203
uses: actions/setup-node@v2
141204
with:
142205
node-version: ${{ env.NODE_VER }}
206+
- name: Cache npm
207+
uses: actions/cache@v2
208+
env:
209+
cache-name: cache-npm
210+
with:
211+
path: ~/.npm
212+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-${{ matrix.mjml-ver }}
213+
restore-keys: |
214+
${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-
143215
- name: Install Node dependencies
144216
run: |
145217
npm cache verify
@@ -151,15 +223,69 @@ jobs:
151223
- name: Test
152224
run: |
153225
python tools.py test
154-
test-py39:
226+
test-py-3-9:
155227
runs-on: ubuntu-latest
156228
env:
157229
PYTHON_VER: 3.9
158230
NODE_VER: 14
159231
strategy:
160232
matrix:
161-
django-ltver: [2.3, 3.1, 3.2, 3.3]
162-
mjml-ver: [4.4.0, 4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.1]
233+
django-ltver: [2.3, 3.1, 3.2, 3.3, 4.1]
234+
mjml-ver: [4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.3, '4.11.0']
235+
fail-fast: false
236+
steps:
237+
- name: Checkout
238+
uses: actions/checkout@v2
239+
- name: Set up Python ${{ env.PYTHON_VER }}
240+
uses: actions/setup-python@v2
241+
with:
242+
python-version: ${{ env.PYTHON_VER }}
243+
- name: Cache pip
244+
uses: actions/cache@v2
245+
env:
246+
cache-name: cache-pip
247+
with:
248+
path: ~/.cache/pip
249+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-${{ matrix.django-ltver }}
250+
restore-keys: |
251+
${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-
252+
- name: Install Python dependencies
253+
run: |
254+
pip install "Django<${{ matrix.django-ltver }}"
255+
pip install "requests>=2.20.0,<=2.24.0"
256+
- name: Set up Node.js ${{ env.NODE_VER }}
257+
uses: actions/setup-node@v2
258+
with:
259+
node-version: ${{ env.NODE_VER }}
260+
- name: Cache npm
261+
uses: actions/cache@v2
262+
env:
263+
cache-name: cache-npm
264+
with:
265+
path: ~/.npm
266+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-${{ matrix.mjml-ver }}
267+
restore-keys: |
268+
${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-
269+
- name: Install Node dependencies
270+
run: |
271+
npm cache verify
272+
npm install -g mjml-http-server@0.0.3
273+
npm install mjml@${{ matrix.mjml-ver }}
274+
- name: Show info
275+
run: |
276+
node_modules/.bin/mjml --version
277+
- name: Test
278+
run: |
279+
python tools.py test
280+
test-py-3-10:
281+
runs-on: ubuntu-latest
282+
env:
283+
PYTHON_VER: '3.10'
284+
NODE_VER: 14
285+
strategy:
286+
matrix:
287+
django-ltver: [3.3, 4.1]
288+
mjml-ver: [4.5.1, 4.6.3, 4.7.1, 4.8.2, 4.9.3, 4.10.3, '4.11.0']
163289
fail-fast: false
164290
steps:
165291
- name: Checkout
@@ -168,6 +294,15 @@ jobs:
168294
uses: actions/setup-python@v2
169295
with:
170296
python-version: ${{ env.PYTHON_VER }}
297+
- name: Cache pip
298+
uses: actions/cache@v2
299+
env:
300+
cache-name: cache-pip
301+
with:
302+
path: ~/.cache/pip
303+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-${{ matrix.django-ltver }}
304+
restore-keys: |
305+
${{ runner.os }}-${{ env.cache-name }}-${{ env.PYTHON_VER }}-
171306
- name: Install Python dependencies
172307
run: |
173308
pip install "Django<${{ matrix.django-ltver }}"
@@ -176,6 +311,15 @@ jobs:
176311
uses: actions/setup-node@v2
177312
with:
178313
node-version: ${{ env.NODE_VER }}
314+
- name: Cache npm
315+
uses: actions/cache@v2
316+
env:
317+
cache-name: cache-npm
318+
with:
319+
path: ~/.npm
320+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-${{ matrix.mjml-ver }}
321+
restore-keys: |
322+
${{ runner.os }}-${{ env.cache-name }}-${{ env.NODE_VER }}-
179323
- name: Install Node dependencies
180324
run: |
181325
npm cache verify

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,4 @@ tests/db.sqlite3
7070
# node
7171
node_modules/
7272
package-lock.json
73+
package.json

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
0.12.0 (2022-01-19)
2+
===================
3+
* Added supporting Django 4.0
4+
* Upgraded MJML to 4.11.0 in dockerfile
5+
* Added Python 3.10 in tests
6+
* Added MJML 4.11.0 in tests
7+
* Removed MJML 4.4.0 from tests
8+
9+
110
0.11.0 (2021-07-04)
211
===================
312
* Added supporting Django v3.2

‎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 1.8 to 3.2
28+
* ``Django`` from 1.8 to 4.0
2929
* ``requests`` from 2.20.0 (only if you are going to use API HTTP-server for rendering)
30-
* ``mjml`` from 2.3 to 4.10.1
30+
* ``mjml`` from 2.3 to 4.11.0
3131

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

‎docker/mjml-tcpserver/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM node:14-stretch
1+
FROM node:14-bullseye
22

3-
ARG MJML_VERSION=4.9.3
4-
ARG TCPSERVER_VERSION=0.9.0
3+
ARG MJML_VERSION=4.11.0
4+
ARG TCPSERVER_VERSION=0.11.0
55
ARG APP_DIR=/app
66

77
RUN npm install mjml@${MJML_VERSION}

‎mjml/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
__version__ = '0.11.0'
1+
__version__ = '0.12.0'
22

33
default_app_config = 'mjml.apps.MJMLConfig'

‎requirements.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
wheel==0.36.2
1+
wheel==0.37.1
22
twine==1.15.0; python_version < "3"
3-
twine==3.4.1; python_version >= "3"
4-
coverage==5.5
3+
twine==3.7.1; python_version >= "3"
4+
coverage==5.5; python_version < "3"
5+
coverage==6.2; python_version >= "3"
56
django<1.12; python_version < "3"
6-
django>=1.8,<3.3; python_version >= "3"
7+
django>=1.8,<4.1; python_version >= "3"
78
six==1.15.0; python_version < "3"
89
ndg-httpsclient>=0.5.1; python_version < "3"
910
mock<4.1; python_version < "3"

‎setup.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
zip_safe=False, # because include static
1818
platforms=['OS Independent'],
1919
install_requires=[
20-
'django >=1.8,<3.3',
20+
'django >=1.8,<4.1',
2121
],
2222
extras_require={
2323
'requests': [
24-
'requests>=2.20; python_version >= "3.0"',
24+
'requests >=2.20; python_version >= "3.0"',
2525
'requests[security] >= 2.20; python_version < "3.0"',
2626
],
2727
},
@@ -35,11 +35,11 @@
3535
'Programming Language :: Python :: 2',
3636
'Programming Language :: Python :: 2.7',
3737
'Programming Language :: Python :: 3',
38-
'Programming Language :: Python :: 3.5',
3938
'Programming Language :: Python :: 3.6',
4039
'Programming Language :: Python :: 3.7',
4140
'Programming Language :: Python :: 3.8',
4241
'Programming Language :: Python :: 3.9',
42+
'Programming Language :: Python :: 3.10',
4343
'Intended Audience :: Developers',
4444
'Topic :: Software Development :: Libraries',
4545
'Topic :: Software Development :: Libraries :: Application Frameworks',

0 commit comments

Comments
 (0)