aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gmail.com>2015-07-22 01:58:22 -0400
committerTim Harder <radhermit@gmail.com>2015-07-22 23:42:56 -0400
commit9369adf754045e7712db2539a1df9b401f2907e1 (patch)
treea67a81bb37fee667cff8b1d0b37a19182e1add03 /tox.ini
parentMerge commit '59ce436cdabbf9e496ac59f0f4dac0cbaaf4554e' as 'pkgdist' (diff)
downloadpkgcore-9369adf754045e7712db2539a1df9b401f2907e1.tar.gz
pkgcore-9369adf754045e7712db2539a1df9b401f2907e1.tar.bz2
pkgcore-9369adf754045e7712db2539a1df9b401f2907e1.zip
use setuptools explicitly with subtree-ed pkgdist module
This should allow setuptools setup.py dep parsing to work as expected.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini7
1 files changed, 0 insertions, 7 deletions
diff --git a/tox.ini b/tox.ini
index ae3f5216..79a972c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,5 @@
[tox]
envlist = py27, py33, py34
-# snakeoil is required for sdist which runs before deps are installed
-skipsdist = True
[testenv]
whitelist_externals = cp
skip_install = True
@@ -13,9 +11,7 @@ deps =
pytest-xdist
pytest-cov
mock
- https://github.com/pkgcore/snakeoil/archive/master.tar.gz
commands =
- pip install -I "{toxinidir}"
cp "{toxinidir}/.coveragerc" "{envsitepackagesdir}"
py.test {posargs:-n 4 --cov pkgcore pkgcore/test}
@@ -27,9 +23,7 @@ setenv =
deps =
sphinx
pyparsing
- https://github.com/pkgcore/snakeoil/archive/master.tar.gz
commands =
- pip install -I .
make -C doc {posargs:man html}
# stub for travis-ci python nightly target tests
@@ -37,6 +31,5 @@ commands =
# override commands so pytest-xdist isn't used since one of its deps
# (execnet) doesn't appear to be working on py35 yet
commands =
- pip install -I "{toxinidir}"
cp "{toxinidir}/.coveragerc" "{envsitepackagesdir}"
py.test {posargs:--cov pkgcore pkgcore/test}