merge conflict

.travis.yml

@@ -1,27 +1,45 @@
-sudo: false
 language: python
+
+sudo: false
+
 python:
-  - '2.7'
-  - '3.4'
-  - '3.5'
-  - '3.6'
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+
 env:
-  global:
-    - DB=postgres
   matrix:
-    - DJANGO=">=1.9,<1.10"
-    - DJANGO=">=1.10,<1.11"
-    - DJANGO=">=1.11,<2.0"
+    - DJANGO=1.11
+    - DJANGO=2.0
+    - DJANGO=master
+
+addons:
+  postgresql: '9.5'
+
+matrix:
+  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
+
 install:
-  - pip install -q coveralls coverage flake8 Django$DJANGO django-nose>=1.4
-  - pip install -r requirements/docs.txt
+    - pip install tox-travis
+
 before_script:
   - psql -c 'CREATE DATABASE entity_event_slack;' -U postgres
+
 script:
-  - flake8 .
-  - coverage run setup.py test
-  - coverage report --fail-under=100
-  - python setup.py install
-  - python setup.py build_sphinx
+    - tox
+
 after_success:
   coveralls
+
+notifications:
+    email: false

entity_event_slack/version.py

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

requirements/requirements-testing.txt

@@ -0,0 +1,7 @@
+coverage
+django-dynamic-fixture
+django-nose
+flake8
+freezegun
+mock
+psycopg2

setup.py

@@ -38,17 +38,16 @@ def get_version():
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
     ],
     license='MIT',
     install_requires=[
         'celery>=3.1,<4.0',
-        'Django>=1.9',
-        'django-db-mutex>=0.5.0',
-        'django-entity-event>=0.8.0',
-        'django-manager-utils>=0.13.0',
+        'Django>=1.11',
+        'django-db-mutex>=1.1.0',
+        'django-entity-event>=1.1.0',
+        'django-manager-utils>=1.1.1',
         'pyslack>=0.1.3',
         'requests',
     ],

tox.ini

@@ -0,0 +1,28 @@
+[tox]
+envlist =
+    flake8
+    py{27,34,35,36}-django111
+    py{34,35,36}-django20
+    py{35,36}-djangomaster
+
+[testenv]
+setenv =
+    DB = postgres
+deps =
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
+    djangomaster: https://github.com/django/django/archive/master.tar.gz
+    -rrequirements/requirements-testing.txt
+commands =
+    coverage run setup.py test
+    coverage report --fail-under=100
+
+[testenv:flake8]
+deps = flake8
+commands = flake8 entity_event_slack
+
+[travis:env]
+DJANGO =
+    1.11: django111
+    2.0: django20
+    master: djangomaster