Merge pull request #12 from ambitioninc/develop

0.5.0

.travis.yml

@@ -3,11 +3,11 @@ language: python
 python:
   - '2.7'
   - '3.4'
+  - '3.5'
 env:
   global:
     - DB=postgres
   matrix:
-    - DJANGO=">=1.7,<1.8"
     - DJANGO=">=1.8,<1.9"
     - DJANGO=">=1.9,<1.10"
 install:

docs/release_notes.rst

@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+v0.5.0
+------
+
+* Add python 3.5 support, remove django 1.7
+
 v0.4.0
 ------
 

entity_event_slack/version.py

@@ -1 +1 @@
-__version__ = '0.4.0'
+__version__ = '0.5.0'

setup.py

@@ -1,8 +1,9 @@
+import re
+from setuptools import setup, find_packages
+
 # import multiprocessing to avoid this bug (http://bugs.python.org/issue15881#msg170215)
 import multiprocessing
 assert multiprocessing
-import re
-from setuptools import setup, find_packages
 
 
 def get_version():
@@ -31,21 +32,21 @@ def get_version():
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
     ],
     license='MIT',
     install_requires=[
-        'celery>=3.1',
-        'Django>=1.7',
-        'django-db-mutex>=0.3.0',
-        'django-entity-event>=0.5.0',
-        'django-manager-utils>=0.9.1',
+        'celery>=3.1,<4.0',
+        'Django>=1.8',
+        'django-db-mutex>=0.4.0',
+        'django-entity-event>=0.6.0',
+        'django-manager-utils>=0.12.0',
         'pyslack>=0.1.3',
         'requests',
     ],
@@ -54,7 +55,7 @@ def get_version():
         'django-nose>=1.4',
         'django-dynamic-fixture',
         'freezegun',
-        'mock==1.0.1',
+        'mock>=1.0.1',
         'coverage>=3.7.1',
     ],
     test_suite='run_tests.run_tests',