Merge pull request #63 from ambitioninc/develop

1.1.0

Author: somewes

.travis.yml

@@ -1,31 +1,28 @@
+dist: xenial
 language: python
-
 sudo: false
 
 python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
   - "3.6"
+  - "3.7"
 
 env:
   matrix:
-    - DJANGO=1.11
     - DJANGO=2.0
+    - DJANGO=2.1
+    - DJANGO=2.2
     - DJANGO=master
 
 addons:
-  postgresql: '9.5'
+  postgresql: '9.6'
 
 matrix:
+  exclude:
+    - { python: "3.7", env: DJANGO=2.0 }
+
   include:
     - { python: "3.6", env: TOXENV=flake8 }
 
-  exclude:
-    - { python: "2.7", env: DJANGO=master }
-    - { python: "2.7", env: DJANGO=2.0 }
-    - { python: "3.4", env: DJANGO=master }
-
   allow_failures:
     - env: DJANGO=master
 

entity_emailer/version.py

@@ -1 +1 @@
-__version__ = '1.0.0'
+__version__ = '1.1.0'

release_notes.rst

@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+v1.1.0
+------
+* Python 3.7
+* Django 2.1
+* Django 2.2
+
 v1.0.0
 ------
 * Django 2.0 support

setup.cfg

@@ -2,7 +2,7 @@
 max-line-length = 120
 exclude = build,docs,venv,env,*.egg,migrations,south_migrations
 max-complexity = 10
-ignore = E402
+ignore = E402, W504
 
 [bdist_wheel]
 universal = 1

setup.py

@@ -30,24 +30,23 @@ def get_version():
     packages=find_packages(),
     classifiers=[
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
     ],
     license='MIT',
     install_requires=[
         'beautifulsoup4>=4.3.2',
-        'Django>=1.11',
-        'django-db-mutex>=1.1.0',
-        'django-entity>=3.1.1',
-        'django-entity-event>=1.1.0',
+        'Django>=2.0',
+        'django-db-mutex>=1.2.0',
+        'django-entity>=4.2.0',
+        'django-entity-event>=1.2.0',
         'ambition-django-uuidfield>=0.5.0',
     ],
     tests_require=[

tox.ini

@@ -1,16 +1,18 @@
 [tox]
 envlist =
     flake8
-    py{27,34,35,36}-django111
-    py{34,35,36}-django20
-    py{35,36}-djangomaster
+    py{36}-django20
+    py{36,37}-django21
+    py{36,37}-django22
+    py{36,37}-djangomaster
 
 [testenv]
 setenv =
     DB = postgres
 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
     djangomaster: https://github.com/django/django/archive/master.tar.gz
     -rrequirements/requirements-testing.txt
 commands =
@@ -23,6 +25,7 @@ commands = flake8 entity_emailer
 
 [travis:env]
 DJANGO =
-    1.11: django111
     2.0: django20
+    2.1: django21
+    2.2: django22
     master: djangomaster