From b8d1d63c2883bb8f9a1b2673c8960f8422997a78 Mon Sep 17 00:00:00 2001
From: Graham Ullrich <graham@flyingcracker.com>
Date: Thu, 11 Aug 2016 11:13:23 -0600
Subject: [PATCH] Improve tox.ini envlist layout, simplified commands. Remove
 tests/app/settings.py in favor of settings in setup.py. Change MANIFEST.in to
 include README.md (which exists) instead of README.rst (which does not
 exist). Update .travis.yml to use tox instead of `python django_admin.py`,
 include Django v1.10 in the mix.

---
 .travis.yml                         |  8 +--
 MANIFEST.in                         |  2 +-
 oidc_provider/tests/app/settings.py | 77 -----------------------------
 tox.ini                             |  9 ++--
 4 files changed, 11 insertions(+), 85 deletions(-)
 delete mode 100644 oidc_provider/tests/app/settings.py

diff --git a/.travis.yml b/.travis.yml
index d947e99..32d0946 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,14 @@ env:
   - DJANGO=1.7
   - DJANGO=1.8
   - DJANGO=1.9
+  - DJANGO=1.10
 matrix:
   exclude:
     - python: "3.5"
       env: DJANGO=1.7
 install:
-  - pip install -q django==$DJANGO
-  - pip install -e .
+  - pip install tox coveralls
 script:
-  - PYTHONPATH=$PYTHONPATH:$PWD django-admin.py test oidc_provider --settings=oidc_provider.tests.app.settings
+  - tox -e py${TRAVIS_PYTHON_VERSION//[.]/}-$DJANGO
+after_success:
+  - coveralls
diff --git a/MANIFEST.in b/MANIFEST.in
index 07cb30b..de708f8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include LICENSE
-include README.rst
+include README.md
 recursive-include oidc_provider/templates *
 recursive-include oidc_provider/tests/templates *
diff --git a/oidc_provider/tests/app/settings.py b/oidc_provider/tests/app/settings.py
deleted file mode 100644
index 39d0c0b..0000000
--- a/oidc_provider/tests/app/settings.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import os
-from datetime import timedelta
-
-
-DEBUG = False
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ':memory:',
-    }
-}
-
-SITE_ID = 1
-
-MIDDLEWARE_CLASSES = [
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-]
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ],
-        },
-    },
-]
-
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        'console': {
-            'class': 'logging.StreamHandler',
-        },
-    },
-    'loggers': {
-        'oidc_provider': {
-            'handlers': ['console'],
-            'level': os.getenv('DJANGO_LOG_LEVEL', 'DEBUG'),
-        },
-    },
-}
-
-INSTALLED_APPS = [
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.admin',
-    'oidc_provider',
-]
-
-SECRET_KEY = 'this-should-be-top-secret'
-
-ROOT_URLCONF = 'oidc_provider.tests.app.urls'
-
-TEMPLATE_DIRS = [
-    'oidc_provider/tests/templates',
-]
-
-USE_TZ = True
-
-# OIDC Provider settings.
-
-SITE_URL = 'http://localhost:8000'
-OIDC_USERINFO = 'oidc_provider.tests.app.utils.userinfo'
diff --git a/tox.ini b/tox.ini
index 5884163..849f411 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,10 @@
 [tox]
 
 envlist=
-    clean,py{27,34}-django{17,18,19,110},py35-django{18,19,110},stats
+    clean,
+    py27-django{17,18,19,110},
+    py34-django{17,18,19,110},
+    py35-django{18,19,110},
 
 [testenv]
 
@@ -14,9 +17,7 @@ deps =
     mock
 
 commands =
-    pip uninstall --yes django-oidc-provider
-    pip install -e .
-    coverage run --omit=.tox/*,oidc_provider/tests/* {envbindir}/django-admin.py test {posargs:oidc_provider} --settings=oidc_provider.tests.app.settings
+    coverage run setup.py test
 
 [testenv:clean]