Merge branch 'develop'

Author: mrogaski

.travis.yml

@@ -7,7 +7,7 @@ env:
   - DJANGO=1.9
   - DJANGO=1.10
 install:
-  - pip install -q Django==$DJANGO --use-mirrors
-  - pip install -q -e . --use-mirrors
+  - pip install -q Django==$DJANGO
+  - python setup.py -q install
 script:
   - python setup.py test

CHANGELOG.md

@@ -0,0 +1,17 @@
+# Change Log
+
+This project uses [Semantic Versioning](http://semver.org/).
+
+## [0.1.1] -- 2016-08-13
+
+### Fixed
+- Removed migration dependencies.
+- Cleaned up TravisCI configuration.
+
+
+## 0.1.0 -- 2016-08-13
+
+Initial release.
+
+
+[0.1.1]: https://github.com/mrogaski/django-discord-bind/compare/0.1.0...0.1.1

discord_bind/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-08-12 04:43
+# Generated by Django 1.10 on 2016-08-13 12:50
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -11,10 +11,7 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('auth', '0008_alter_user_username_max_length'),
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(

discord_bind/tests/test_models.py

@@ -25,7 +25,10 @@
 """
 from __future__ import unicode_literals
 
-from unittest.mock import patch, Mock
+try:
+    from unittest.mock import patch, Mock
+except ImportError:
+    from mock import patch, Mock
 
 from django.test import TestCase
 from django.contrib.auth.models import User, Group

discord_bind/views.py

@@ -30,7 +30,10 @@
 
 from django.conf import settings
 from django.http import HttpResponseRedirect
-from django.urls import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.contrib.auth.decorators import login_required
 from django.utils.timezone import make_aware
 from django.db.models import Q

manage.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+"""
+
+The MIT License (MIT)
+
+Copyright (c) 2016 Mark Rogaski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+"""
+
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

requirements.txt

@@ -1,4 +1,4 @@
 Django>=1.9
 django-setuptest>=0.2.1
 requests>=2.11.0
-requests-oauthlib>=0.6.2
+requests-oauthlib>=0.6.2

setup.py

@@ -36,7 +36,7 @@
 
 setup(
     name='django-discord-bind',
-    version='0.1.0',
+    version='0.1.1',
     packages=find_packages(),
     include_package_data=True,
     license='MIT License',  # example license
@@ -68,6 +68,7 @@
     ],
     tests_require=[
         "django-setuptest >= 0.2.1",
+        "mock"
     ],
     test_suite='setuptest.setuptest.SetupTestSuite',
 )

test_settings.py

@@ -26,17 +26,18 @@
 
 DATABASES = {
     'default': {
+        'NAME': 'test.db',
         'ENGINE': 'django.db.backends.sqlite3',
     }
 }
 
 INSTALLED_APPS = (
-    'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
-    'django.contrib.staticfiles',
     'discord_bind',
 )
 
+SECRET_KEY = 'vn5v8g+q3q*ll)a3kh10wlj#(tc=738cklg9(z3***kw%qhnv-'
+ROOT_URLCONF='discord_bind.urls'