Improve matrix builds; Drop Python 2.6ref/improve-travis

- Add Flask-specific builds
- Add Celery-specific builds
- Restore Django dev build
- Reduce Django builds to only focus on subset of versions
- Expand norecursedirs
- Drop Python 2.6 support (as deps are starting to)
- Update pytest-django
- Limit django-celery exposure
- Correct django-celery 3.1 behavior

1 files changed, 1 insertions, 5 deletions

diff --git a/setup.py b/setup.py
index cf3f058..41fa8cd 100755
--- a/setup.py
+++ b/setup.py
@@ -66,8 +66,6 @@ tests_require = [
     'six',
     'bottle',
     'celery>=2.5',
-    'Django>=1.4',
-    'django-celery>=2.5',
     'exam>=0.5.2',
     'flake8>=2.6,<2.7',
     'logbook',
@@ -75,8 +73,7 @@ tests_require = [
     'nose',
     'pycodestyle',
     'pytz',
-    'pytest>=3.0.0',
-    'pytest-django==2.9.1',
+    'pytest>=3.0.0,<3.1.0',
     'pytest-timeout==0.4',
     'requests',
     'tornado>=4.1',
@@ -137,7 +134,6 @@ setup(
         'Intended Audience :: System Administrators',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',