diff --git a/.travis.yml b/.travis.yml index 8c56635..29c8726 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,24 +11,69 @@ env: - DJANGO_VERSION="<1.9" MJML_VERSION=3.1.1 - DJANGO_VERSION="<1.9" MJML_VERSION=3.2.2 - DJANGO_VERSION="<1.9" MJML_VERSION=3.3.0 + - DJANGO_VERSION="<1.9" MJML_VERSION=3.3.1 + - DJANGO_VERSION="<1.9" MJML_VERSION=3.3.2 + - DJANGO_VERSION="<1.9" MJML_VERSION=3.3.3 + - DJANGO_VERSION="<1.9" MJML_VERSION=3.3.4 + - DJANGO_VERSION="<1.9" MJML_VERSION=3.3.5 - DJANGO_VERSION="<1.10" MJML_VERSION=2.3.3 - DJANGO_VERSION="<1.10" MJML_VERSION=3.0.2 - DJANGO_VERSION="<1.10" MJML_VERSION=3.1.1 - DJANGO_VERSION="<1.10" MJML_VERSION=3.2.2 - DJANGO_VERSION="<1.10" MJML_VERSION=3.3.0 + - DJANGO_VERSION="<1.10" MJML_VERSION=3.3.1 + - DJANGO_VERSION="<1.10" MJML_VERSION=3.3.2 + - DJANGO_VERSION="<1.10" MJML_VERSION=3.3.3 + - DJANGO_VERSION="<1.10" MJML_VERSION=3.3.4 + - DJANGO_VERSION="<1.10" MJML_VERSION=3.3.5 - DJANGO_VERSION="<1.11" MJML_VERSION=2.3.3 - DJANGO_VERSION="<1.11" MJML_VERSION=3.0.2 - DJANGO_VERSION="<1.11" MJML_VERSION=3.1.1 - DJANGO_VERSION="<1.11" MJML_VERSION=3.2.2 - DJANGO_VERSION="<1.11" MJML_VERSION=3.3.0 + - DJANGO_VERSION="<1.11" MJML_VERSION=3.3.1 + - DJANGO_VERSION="<1.11" MJML_VERSION=3.3.2 + - DJANGO_VERSION="<1.11" MJML_VERSION=3.3.3 + - DJANGO_VERSION="<1.11" MJML_VERSION=3.3.4 + - DJANGO_VERSION="<1.11" MJML_VERSION=3.3.5 - 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 + - DJANGO_VERSION="<1.12" MJML_VERSION=3.3.1 + - DJANGO_VERSION="<1.12" MJML_VERSION=3.3.2 + - DJANGO_VERSION="<1.12" MJML_VERSION=3.3.3 + - DJANGO_VERSION="<1.12" MJML_VERSION=3.3.4 + - DJANGO_VERSION="<1.12" MJML_VERSION=3.3.5 + + - DJANGO_VERSION="<2.1" MJML_VERSION=2.3.3 + - DJANGO_VERSION="<2.1" MJML_VERSION=3.0.2 + - DJANGO_VERSION="<2.1" MJML_VERSION=3.1.1 + - DJANGO_VERSION="<2.1" MJML_VERSION=3.2.2 + - DJANGO_VERSION="<2.1" MJML_VERSION=3.3.0 + - DJANGO_VERSION="<2.1" MJML_VERSION=3.3.1 + - DJANGO_VERSION="<2.1" MJML_VERSION=3.3.2 + - DJANGO_VERSION="<2.1" MJML_VERSION=3.3.3 + - DJANGO_VERSION="<2.1" MJML_VERSION=3.3.4 + - DJANGO_VERSION="<2.1" MJML_VERSION=3.3.5 + + +matrix: + exclude: + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=2.3.3 } + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.0.2 } + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.1.1 } + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.2.2 } + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.3.0 } + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.3.1 } + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.3.2 } + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.3.3 } + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.3.4 } + - { python: "2.7", env: DJANGO_VERSION="<2.1" MJML_VERSION=3.3.5 } before_install: - . $HOME/.nvm/nvm.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d14d0f..572ca5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +0.4.0 (2018-01-10) +================== + * Add support Django 2.0 + * Update support new versions of MJML (up to 3.3.5) + + 0.3.2 (2017-04-06) ================== * Add support Django 1.11 diff --git a/mjml/__init__.py b/mjml/__init__.py index a022407..3884a61 100644 --- a/mjml/__init__.py +++ b/mjml/__init__.py @@ -1,3 +1,3 @@ -__version__ = '0.3.2' +__version__ = '0.4.0' default_app_config = 'mjml.apps.MJMLConfig' diff --git a/mjml/apps.py b/mjml/apps.py index f1a0764..79d6bb3 100644 --- a/mjml/apps.py +++ b/mjml/apps.py @@ -8,7 +8,7 @@ def check_mjml_command(): test_mjml = '' test_result_fragment = '=1.9,<1.12 +django>=1.8,<2.1 coverage==4.3.4 diff --git a/requirements_2.7.txt b/requirements_2.7.txt new file mode 100644 index 0000000..98194b9 --- /dev/null +++ b/requirements_2.7.txt @@ -0,0 +1,11 @@ +pip +setuptools +wheel +twine + +django>=1.8,<1.12 +coverage==4.3.4 + + +# for Py2 +# pip install -U ndg-httpsclient diff --git a/setup.py b/setup.py index 5618d44..ae1f74f 100644 --- a/setup.py +++ b/setup.py @@ -10,14 +10,14 @@ description='Use MJML in Django templates', long_description=open(os.path.join(os.path.dirname(__file__), 'README.rst')).read(), license='MIT', - author='Igor Melnyk', + author='Igor Melnyk @liminspace', author_email='liminspace@gmail.com', url='https://github.com/liminspace/django-mjml', packages=find_packages(exclude=('tests', 'tests.*')), include_package_data=True, zip_safe=False, # because include static install_requires=[ - 'django>=1.8,<1.12', + 'django>=1.8,<2.1', ], keywords=[ 'django', 'mjml', 'django-mjml', 'email', 'layout', 'template', 'templatetag', @@ -27,8 +27,8 @@ 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Intended Audience :: Developers', 'Topic :: Software Development :: Libraries', 'Topic :: Software Development :: Libraries :: Application Frameworks', diff --git a/tests/settings.py b/tests/settings.py index c93021e..c42a362 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -5,7 +5,7 @@ DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['*'] INSTALLED_APPS = ( 'mjml',