Merge pull request #7 from liminspace/develop

0.3.2
liminspace · Apr 5, 2017 · 0ecbdc6 · 0ecbdc6
2 parents ecd728f + c3c83e3
commit 0ecbdc6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,12 @@ env:
   - DJANGO_VERSION="<1.11" MJML_VERSION=3.2.2
   - DJANGO_VERSION="<1.11" MJML_VERSION=3.3.0
 
+  - DJANGO_VERSION="<1.12" MJML_VERSION=2.3.3
+  - DJANGO_VERSION="<1.12" MJML_VERSION=3.0.2
+  - DJANGO_VERSION="<1.12" MJML_VERSION=3.1.1
+  - DJANGO_VERSION="<1.12" MJML_VERSION=3.2.2
+  - DJANGO_VERSION="<1.12" MJML_VERSION=3.3.0
+
 before_install:
   - . $HOME/.nvm/nvm.sh
   - nvm install stable

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.3.2 (2017-04-06)
+==================
+  * Add support Django 1.11
+
+
 0.3.1 (2017-03-18)
 ==================
   * Update support new versions of MJML (up to 3.3.0)

diff --git a/mjml/__init__.py b/mjml/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '0.3.1'
+__version__ = '0.3.2'
 
 default_app_config = 'mjml.apps.MJMLConfig'
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ setuptools
 wheel
 twine
 
-django>=1.9,<1.11
+django>=1.9,<1.12
 coverage==4.3.4
 
 

diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
     include_package_data=True,
     zip_safe=False,  # because include static
     install_requires=[
-        'django>=1.8,<1.11',
+        'django>=1.8,<1.12',
     ],
     keywords=[
         'django', 'mjml', 'django-mjml', 'email', 'layout', 'template', 'templatetag',