Merge pull request #13 from ambitioninc/develop

1.8 upgrade

.coveragerc

@@ -2,7 +2,6 @@
 branch = True
 omit =
     issue/migrations/*
-    issue/south_migrations/*
     issue/tests/*
     issue/version.py
     issue/apps.py

.travis.yml

@@ -7,13 +7,12 @@ addons:
   postgresql: '9.3'
 env:
   global:
-    - NOSE_NOLOGCAPTURE=1
     - DB=postgres
   matrix:
-    - DJANGO=1.6.11
-    - DJANGO=1.7.7
+    - DJANGO=">=1.7,<1.8"
+    - DJANGO=">=1.8,<1.9"
 install:
-  - pip install -q coveralls coverage flake8 Django==$DJANGO
+  - pip install -q coveralls coverage flake8 Django$DJANGO
   - pip install -r requirements/docs.txt
 before_script:
   - psql -c 'CREATE DATABASE issue;' -U postgres

docs/release_notes.rst

@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+v1.1.0
+------
+* Django 1.8 support and removal of 1.6 support
+
 v1.0.5
 ------
 * Additional tweak to the behavior of maybe_open_issue

issue/__init__.py

@@ -2,4 +2,4 @@
 from .version import __version__
 from .models import Assertion, Issue, IssueManager, IssueStatus, ModelAssertion, ModelIssue, ModelIssueManager, Responder, ResponderAction
 
-django_app_config = 'issue.apps.IssueConfig'
+default_app_config = 'issue.apps.IssueConfig'

issue/version.py

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

publish.py

@@ -0,0 +1,5 @@
+import subprocess
+
+subprocess.call(['pip', 'install', 'wheel'])
+subprocess.call(['python', 'setup.py', 'clean', '--all'])
+subprocess.call(['python', 'setup.py', 'register', 'sdist', 'bdist_wheel', 'upload'])

requirements/docs.txt

@@ -1,4 +1,4 @@
 Sphinx>=1.2.2
 sphinx_rtd_theme
 psycopg2>=2.4.5
-django>=1.6
+django>=1.7

run_tests.py

@@ -4,26 +4,17 @@
 import sys
 from optparse import OptionParser
 
-import django
-from django.conf import settings
-
 from settings import configure_settings
 
 
 # Configure the default settings
 configure_settings()
-if django.VERSION[1] >= 7:
-    django.setup()
 
 # Django nose must be imported here since it depends on the settings being configured
 from django_nose import NoseTestSuiteRunner
 
 
 def run_tests(*test_args, **kwargs):
-    if 'south' in settings.INSTALLED_APPS:
-        from south.management.commands import patch_for_test_db_setup
-        patch_for_test_db_setup()
-
     if not test_args:
         test_args = ['issue']
 
@@ -38,7 +29,6 @@ def run_tests(*test_args, **kwargs):
 if __name__ == '__main__':
     parser = OptionParser()
     parser.add_option('--verbosity', dest='verbosity', action='store', default=1, type=int)
-    parser.add_options(NoseTestSuiteRunner.options)
     (options, args) = parser.parse_args()
 
     run_tests(*args, **options.__dict__)

settings.py

@@ -1,6 +1,5 @@
 import os
 
-import django
 from django.conf import settings
 
 
@@ -45,7 +44,9 @@ def configure_settings():
                 'django.contrib.admin',
                 'issue',
                 'issue.tests',
-            ) + (('south',) if django.VERSION[1] <= 6 else ()),
+            ),
             ROOT_URLCONF='issue.urls',
             DEBUG=False,
+            TEST_RUNNER='django_nose.NoseTestSuiteRunner',
+            NOSE_ARGS=['--nocapture', '--nologcapture', '--verbosity=1'],
         )

setup.cfg

@@ -1,6 +1,6 @@
 [flake8]
 max-line-length = 120
-exclude = build,docs,venv,env,*.egg,migrations,south_migrations
+exclude = build,docs,venv,env,*.egg,migrations
 ignore = E402
 max-complexity = 10
 

setup.py

@@ -35,25 +35,24 @@ def get_version():
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 1.6',
         'Framework :: Django :: 1.7',
+        'Framework :: Django :: 1.8',
     ],
     license='MIT',
     install_requires=[
-        'Django>=1.6',
-        'django-manager-utils>=0.7.2',
-        'django-regex-field>=0.1.5',
+        'Django>=1.7',
+        'django-manager-utils>=0.8.2',
+        'django-regex-field>=0.2.0',
         'enum34>=1.0',
         'jsonfield>=0.9.20',
     ],
     tests_require=[
         'psycopg2',
         'coverage>=3.7.1',
-        'south>=1.0.2',
         'django-dynamic-fixture>=1.7.0',
-        'django-nose',
+        'django-nose>=1.4',
         'freezegun>=0.1.12',
-        'mock>=1.0.1',
+        'mock==1.0.1',
         'ipdb>=0.8',
         'ipdbplugin>=1.4',
         'six>=1.8.0',