X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=413b84a903b0a5be695070059f33d8fde358bbd6;hb=a862ae7e38203d37bdba9b53846dff084aade362;hp=eda942704659654fd8ee590762fa8433ecf30f34;hpb=0e3c1d9d63524fa38fc4639f9d344c12188c4f62;p=m_librarian.git diff --git a/tox.ini b/tox.ini index eda9427..413b84a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,12 @@ [tox] minversion = 1.8 toxworkdir={homedir}/.tox/m_librarian -envlist = {py26,py27,py34},{py27,py34}-flake8 +envlist = {py27,py34},{py27,py34}-flake8 # Base test environment settings [testenv] deps = - pytest - pytest-cov - py26: argparse - py26,py27: SQLObject>=2.2.1 - py34: SQLObject>=3.0.0 - py26,py27: m_lib>=2.0 - py34: m_lib>=3.0 + -rdevscripts/requirements/requirements_tests.txt sitepackages = True # Don't fail or warn on uninstalled commands whitelist_externals = @@ -22,9 +16,6 @@ whitelist_externals = commands = python -m pytest --cov=m_librarian -[testenv:py26] -commands = {[general]commands} - [testenv:py27] commands = {[general]commands}