Skip to content

Commit

Permalink
Release 0.10.1
Browse files Browse the repository at this point in the history
  *  Added supporting Django v3.1 (#111)
  • Loading branch information
liminspace committed Aug 16, 2020
1 parent ea2d7f3 commit b52fb1a
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 7 deletions.
18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ env:
- DJANGO_VERSION="<3.1" MJML_VERSION=4.5.1
- DJANGO_VERSION="<3.1" MJML_VERSION=4.6.3

- DJANGO_VERSION="<3.2" MJML_VERSION=3.3.5
- DJANGO_VERSION="<3.2" MJML_VERSION=4.3.1
- DJANGO_VERSION="<3.2" MJML_VERSION=4.4.0
- DJANGO_VERSION="<3.2" MJML_VERSION=4.5.1
- DJANGO_VERSION="<3.2" MJML_VERSION=4.6.3

matrix:
exclude:
- { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.3.5 }
Expand Down Expand Up @@ -90,6 +96,18 @@ matrix:
- { python: "3.5", env: DJANGO_VERSION="<3.1" MJML_VERSION=4.5.1 }
- { python: "3.5", env: DJANGO_VERSION="<3.1" MJML_VERSION=4.6.3 }

- { python: "2.7", env: DJANGO_VERSION="<3.2" MJML_VERSION=3.3.5 }
- { python: "2.7", env: DJANGO_VERSION="<3.2" MJML_VERSION=4.3.1 }
- { python: "2.7", env: DJANGO_VERSION="<3.2" MJML_VERSION=4.4.0 }
- { python: "2.7", env: DJANGO_VERSION="<3.2" MJML_VERSION=4.5.1 }
- { python: "2.7", env: DJANGO_VERSION="<3.2" MJML_VERSION=4.6.3 }

- { python: "3.5", env: DJANGO_VERSION="<3.2" MJML_VERSION=3.3.5 }
- { python: "3.5", env: DJANGO_VERSION="<3.2" MJML_VERSION=4.3.1 }
- { python: "3.5", env: DJANGO_VERSION="<3.2" MJML_VERSION=4.4.0 }
- { python: "3.5", env: DJANGO_VERSION="<3.2" MJML_VERSION=4.5.1 }
- { python: "3.5", env: DJANGO_VERSION="<3.2" MJML_VERSION=4.6.3 }

- { python: "3.6", env: DJANGO_VERSION="<1.9" MJML_VERSION=3.3.5 }
- { python: "3.6", env: DJANGO_VERSION="<1.9" MJML_VERSION=4.3.1 }
- { python: "3.6", env: DJANGO_VERSION="<1.9" MJML_VERSION=4.4.0 }
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.10.1 (2020-08-16)
===================
* Added supporting Django v3.1


0.10.0 (2020-06-29)
===================
* Added `requests` in extras require in `setup.py`
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Installation
Requirements:
^^^^^^^^^^^^^

* Django from 1.8 to 3.0
* Django from 1.8 to 3.1
* requests from 2.20.0 (only if you are going to use API HTTP-server for rendering)
* mjml from 2.3 to 4.6.3

Expand Down
2 changes: 1 addition & 1 deletion mjml/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '0.10.0'
__version__ = '0.10.1'

default_app_config = 'mjml.apps.MJMLConfig'
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
wheel==0.34.2
wheel==0.35.1
twine==1.15.0; python_version < "3"
twine==3.2.0; python_version >= "3"
coverage==5.1
coverage==5.2.1
django<1.12; python_version < "3"
django>=1.8,<3.1; python_version >= "3"
django>=1.8,<3.2; python_version >= "3"
six==1.15.0; python_version < "3"
ndg-httpsclient>=0.5.1; python_version < "3"
mock<3.1; python_version < "3"
mock<4.1; python_version < "3"
requests>=2.19.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
zip_safe=False, # because include static
platforms=['OS Independent'],
install_requires=[
'django >=1.8,<3.1',
'django >=1.8,<3.2',
],
extras_require={
'requests': [
Expand Down

0 comments on commit b52fb1a

Please sign in to comment.