Remove 'test-reqs.txt'

We were never really using this file for its specified purpose [1]. Now that we have everything cleanly organized in 'setup.py', there really isn't any reason to keep it around. Remove it. [1] https://caremad.io/posts/2013/07/setup-vs-requirement/ Signed-off-by: Stephen Finucane <[email protected]>
alyjak · Oct 10, 2017 · 67753b7 · 67753b7
1 parent eb8efce
commit 67753b7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -116,7 +116,7 @@ These are the basic steps needed to start developing on Sphinx.
 
    * Run the unit tests::
 
-       pip install -r test-reqs.txt
+       pip install .[test,websupport]
        make test
 
    * Again, it's useful to turn on deprecation warnings on so they're shown in

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -12,7 +12,6 @@ include sphinx-autogen.py
 include sphinx-build.py
 include sphinx-quickstart.py
 include sphinx-apidoc.py
-include test-reqs.txt
 include tox.ini
 include sphinx/locale/.tx/config
 

diff --git a/test-reqs.txt b/test-reqs.txt
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,12 @@ envlist=flake8,mypy,py{27,34,35,36},pypy,du{11,12,13,14}
 
 [testenv]
 passenv = https_proxy http_proxy no_proxy
-deps=-rtest-reqs.txt
+# TODO(stephenfin) Replace this with the 'extras' config option when tox 2.4 is
+# widely available, likely some time after the Ubuntu 18.04 release
+#
+# https://tox.readthedocs.io/en/latest/config.html#confval-extras=MULTI-LINE-LIST
+deps =
+    .[test,websupport]
 setenv =
     SPHINX_TEST_TEMPDIR = {envdir}/testbuild
 commands=