From 136e3533ff565dc5b8dc3046eebdd8c3050d9338 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 16 Sep 2018 05:36:29 +0200
Subject: [PATCH] Add extras_require=testing

---
 setup.py | 10 +++++++++-
 tox.ini  | 21 +++++----------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/setup.py b/setup.py
index ebcd4e557..d964d5417 100755
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,15 @@
       packages=find_packages(exclude=['test', 'test.*']),
       python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
       install_requires=install_requires,
-      extras_require={'dev': ['docopt']},
+      extras_require={
+          'testing': [
+              'pytest>=2.3.5',
+              # docopt for sith doctests
+              'docopt',
+              # coloroma for colored debug output
+              'colorama',
+          ],
+      },
       package_data={'jedi': ['evaluate/compiled/fake/*.pym']},
       platforms=['any'],
       classifiers=[
diff --git a/tox.ini b/tox.ini
index f450b7354..92d61f876 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,10 @@
 [tox]
 envlist = py27, py34, py35, py36
 [testenv]
-deps =
-    pytest>=2.3.5
-    pytest-cache
-# docopt for sith doctests
-    docopt
-# coloroma for colored debug output
-    colorama
+extras = testing
 # Overwrite the parso version (only used sometimes).
-#    git+https://github.com/davidhalter/parso.git
-    -rrequirements.txt
+# deps =
+#     git+https://github.com/davidhalter/parso.git
 passenv = JEDI_TEST_ENVIRONMENT
 setenv =
 # https://github.com/tomchristie/django-rest-framework/issues/1957
@@ -24,34 +18,29 @@ setenv =
     env36: JEDI_TEST_ENVIRONMENT=36
     env37: JEDI_TEST_ENVIRONMENT=37
 commands =
-    py.test {posargs:jedi test}
+    pytest {posargs:jedi test}
 [testenv:py27]
 deps =
 # for testing the typing module
     typing
 # numpydoc for typing scipy stack
     numpydoc
-    {[testenv]deps}
 [testenv:py34]
 deps =
     typing
     numpydoc
-    {[testenv]deps}
 [testenv:py35]
 deps =
     numpydoc
-    {[testenv]deps}
 [testenv:py36]
 deps =
     numpydoc
-    {[testenv]deps}
 [testenv:cov]
 deps =
     coverage
     numpydoc
-    {[testenv]deps}
 commands =
-    coverage run --source jedi -m py.test
+    coverage run --source jedi -m pytest
     coverage report
 [testenv:sith]
 commands =