Merge pull request #1981 from pypa/feature/deps-in-metadata

Move test dependencies to package metadata.

1 files changed, 7 insertions, 7 deletions

diff --git a/tox.ini b/tox.ini
index 6c73bd0c..2164599f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,18 +13,18 @@ requires =
 pip = python {toxinidir}/tools/tox_pip.py
 
 [testenv]
-deps=-r{toxinidir}/setuptools/tests/requirements.txt
 pip_version = pip
 install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
 setenv =
 	COVERAGE_FILE={toxworkdir}/.coverage.{envname}
-	py{27,py2}: PIP_IGNORE_REQUIRES_PYTHON=true
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED
 commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs}
 usedevelop=True
+extras =
+	tests
 
 
 [testenv:coverage]
@@ -44,12 +44,12 @@ skip_install=True
 commands=codecov -X gcov --file {toxworkdir}/coverage.xml
 
 [testenv:docs]
-deps = -r{toxinidir}/docs/requirements.txt
-skip_install=True
+extras =
+        docs
+        testing
+changedir = docs
 commands =
-    python -m bootstrap
-    sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html
-    sphinx-build -W -b man -d {envtmpdir}/doctrees docs docs/build/man
+        python -m sphinx . {toxinidir}/build/html
 
 [coverage:run]
 source=