From 0e45c7b3e4ec2f20e26d0ff71eb7f9c487922182 Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Sun, 9 Dec 2018 15:52:05 +0100
Subject: [PATCH] Also move testing requirements into packaging setup

---
 setup.py               | 13 +++++++++++--
 tests/requirements.txt |  8 --------
 tox.ini                | 13 ++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 tests/requirements.txt

diff --git a/setup.py b/setup.py
index 62ded85..7a2efdf 100644
--- a/setup.py
+++ b/setup.py
@@ -46,6 +46,16 @@ setup(
         'database': ['dj-database-url'],
         'email': ['dj-email-url'],
         'search': ['dj-search-url'],
+        'testing': [
+            'django-discover-runner',
+            'mock',
+            'django-cache-url>=1.0.0',
+            'dj-database-url',
+            'dj-email-url',
+            'dj-search-url',
+            'six',
+            'Sphinx>=1.4',
+        ],
     },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -55,10 +65,9 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Utilities',
     ],
     zip_safe=False,
diff --git a/tests/requirements.txt b/tests/requirements.txt
deleted file mode 100644
index f62636b..0000000
--- a/tests/requirements.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-django-discover-runner
-mock
-dj-database-url
-dj-email-url
-dj-search-url
-django-cache-url>=1.0.0
-six
-Sphinx>=1.4
diff --git a/tox.ini b/tox.ini
index cca6f96..5f3454b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
-skipsdist = True
-usedevelop = True
+skipsdist = true
+usedevelop = true
 minversion = 1.8
-whitelist_externals=sphinx-build
+whitelist_externals = sphinx-build
 envlist =
     flake8-py27,
     flake8-py36,
@@ -19,7 +19,6 @@ setenv =
     coverage: COVERAGE_PROCESS_START = {toxinidir}/setup.cfg
     coverage: _TEST_RUN_PREFIX=coverage run
 deps =
-    -rtests/requirements.txt
     dj18: django>=1.8,<1.9
     dj110: django>=1.10,<1.11
     dj111: django>=1.11,<2.0
@@ -29,7 +28,7 @@ deps =
     py27,pypy: mock
     coverage: coverage
     coverage: coverage_enable_subprocess
-
+extras = testing
 commands =
     python --version
     {env:_TEST_RUN_PREFIX:} {envbindir}/django-cadmin test -v2 {posargs:tests}
@@ -49,5 +48,5 @@ commands = flake8 configurations tests
 deps = flake8
 
 [flake8]
-exclude=.tox
-ignore=E501,E127,E128,E124
+exclude = .tox
+ignore = E501,E127,E128,E124