Merge pull request #90 from Niouby/master

update python/django support: run tests for django 2.2
peopledoc · Apr 18, 2019 · 249fdf3 · 249fdf3
2 parents 3d361b9 + 5783677
commit 249fdf3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,10 @@ matrix:
           env: TOX_ENV=py35-django111
         - python: 3.5
           env: TOX_ENV=py35-django20
+        - python: 3.5
+          env: TOX_ENV=py35-django21
+        - python: 3.5
+          env: TOX_ENV=py35-django22
 
         - python: 3.6
           env: TOX_ENV=py36-django111
@@ -19,12 +23,16 @@ matrix:
         - python: 3.6
           env: TOX_ENV=py36-django21
         - python: 3.6
-          env: TOX_ENV=py36-djangostable
+          env: TOX_ENV=py36-django22
 
         - python: 3.7
           env: TOX_ENV=py37-django20
         - python: 3.7
           env: TOX_ENV=py37-django21
+        - python: 3.7
+          env: TOX_ENV=py37-django22
+        - python: 3.7
+          env: TOX_ENV=py37-djangostable
 
         - env: TOX_ENV=flake8
 

diff --git a/CHANGELOG b/CHANGELOG
@@ -4,7 +4,7 @@ Changelog
 0.22 (unreleased)
 -----------------
 
-- Nothing changed yet.
+- Run tests for Django 2.2 and Python 3.5, 3.6 and 3.7
 
 
 0.21 (2018-09-20)

diff --git a/README.rst b/README.rst
@@ -15,7 +15,7 @@ Django Mail Factory lets you manage your email in a multilingual project.
 * Authors: Rémy Hubscher and `contributors
   <https://github.com/peopledoc/django-mail-factory/graphs/contributors>`_
 * Licence: BSD
-* Compatibility: Django 1.11, 2.0, python2.7, python3.5 and python3.6
+* Compatibility: Django 1.11, 2.0, 2.1 and 2.2, python2.7, 3.5, 3.6 and 3.7
 * Project URL: https://github.com/peopledoc/django-mail-factory
 * Documentation: http://django-mail-factory.rtfd.org/
 

diff --git a/demo/demo/settings.py b/demo/demo/settings.py
@@ -91,6 +91,7 @@
         'OPTIONS': {
             'context_processors': [
                 'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
             ]
         },
     },

diff --git a/setup.py b/setup.py
@@ -21,6 +21,10 @@ def read_relative_file(filename):
             'Development Status :: 3 - Alpha',
             'Environment :: Web Environment',
             'Framework :: Django',
+            'Framework :: Django :: 1.11',
+            'Framework :: Django :: 2.0',
+            'Framework :: Django :: 2.1',
+            'Framework :: Django :: 2.2',
             'Intended Audience :: Developers',
             'License :: OSI Approved :: BSD License',
             'Natural Language :: English',
@@ -30,6 +34,7 @@ def read_relative_file(filename):
             'Programming Language :: Python :: 3',
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
         ],
         keywords='django mail manager',
         author='Rémy Hubscher',

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist =
     py{27,35,36}-django111
-    py{35,36,37}-django{20,21}
-    py36-djangostable
+    py{35,36,37}-django{20,21,22}
+    py37-djangostable
     flake8
 
 [testenv]
@@ -11,6 +11,7 @@ deps =
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<2.3
     djangostable: Django
     coverage
 commands =