Merge pull request #17 from ambitioninc/develop

1.3.0
ambitioninc · Nov 28, 2016 · e569f6b · e569f6b
2 parents 5a6c9d7 + 6905226
commit e569f6b
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,13 +3,13 @@ language: python
 python:
   - '2.7'
   - '3.4'
+  - '3.5'
 addons:
   postgresql: '9.3'
 env:
   global:
     - DB=postgres
   matrix:
-    - DJANGO=">=1.7,<1.8"
     - DJANGO=">=1.8,<1.9"
     - DJANGO=">=1.9,<1.10"
 install:

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+v1.3.0
+------
+* Python 3.5 support, remove django 1.7 support
+
 v1.2.0
 ------
 * Django 1.9 support

diff --git a/issue/tests/checker_tests.py b/issue/tests/checker_tests.py
@@ -38,7 +38,7 @@ def test_check_assertions_counts_only_failing(self, assertion_check):
 
 
 class RespondToIssuesTests(TestCase):
-    @patch.object(Responder, 'respond', spec_set=True)
+    @patch.object(Responder, 'respond')
     def test_respond_to_issues_checks_issues_and_model_issues(self, respond):
         # Setup the scenario
         i = Issue.objects.create(name='an-issue')

diff --git a/issue/tests/model_tests.py b/issue/tests/model_tests.py
@@ -502,7 +502,7 @@ def test_check_when_all_is_well(self, load_function, resolve_open_issue):
         self.assertTrue(assertion.check_assertion())
         self.assertTrue(resolve_open_issue.called)
 
-    @patch.object(Assertion, '_open_or_update_issue', spec_set=True)
+    @patch.object(Assertion, '_open_or_update_issue')
     @patch('issue.models.load_function', spec_set=True)
     def test_check_when_all_is_not_well(self, load_function, open_or_update_issue):
         issue_details = {

diff --git a/issue/version.py b/issue/version.py
@@ -1 +1 @@
-__version__ = '1.2.0'
+__version__ = '1.3.0'
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,4 +1,2 @@
 Sphinx>=1.2.2
 sphinx_rtd_theme
-psycopg2>=2.4.5
-django>=1.7
diff --git a/setup.py b/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,18 +32,18 @@ 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=[
-        'Django>=1.7',
-        'django-manager-utils>=0.9.1',
+        'Django>=1.8',
+        'django-manager-utils>=0.12.0',
         'django-regex-field>=0.2.0',
         'enum34>=1.0',
         'jsonfield>=0.9.20',
@@ -53,7 +54,7 @@ def get_version():
         'django-dynamic-fixture>=1.7.0',
         'django-nose>=1.4',
         'freezegun>=0.1.12',
-        'mock==1.0.1',
+        'mock>=1.0.1',
         'six>=1.8.0',
     ],
     test_suite='run_tests.run_tests',