aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-02-24 11:49:51 -0500
committerJason R. Coombs <jaraco@jaraco.com>2017-02-24 11:49:51 -0500
commit3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 (patch)
tree2286b3cd70544e0089f658e17ddb3fed4126b356 /tox.ini
parent4c560effc96a75f337193bc164ad4117b0e333ab (diff)
downloadexternal_python_setuptools-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.tar.gz
external_python_setuptools-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.tar.bz2
external_python_setuptools-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.zip
Revert "Merge pull request #933 from pypa/feature/581-depend-not-bundle"
This reverts commit 089cdeb489a0fa94d11b7307b54210ef9aa40511, reversing changes made to aaec654d804cb78dbb6391afff721a63f26a71cd.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini5
1 files changed, 1 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 6b43dcd8..cae9c745 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,5 @@
[testenv]
-deps=
- -rtests/requirements.txt
- -rrequirements.txt
+deps=-rtests/requirements.txt
passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
commands=py.test {posargs:-rsx}
usedevelop=True
-extras=ssl