Merge "Remove the tox venv patcharm64"

[functest.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 4de5fa4..9acfffe 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -4,13 +4,11 @@ envlist = docs,pep8,pylint,py35,py27,perm
 [testenv]
 usedevelop = True
 deps =
+  -c{toxinidir}/upper-constraints.txt
+  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-  git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
-  git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps
-install_command = pip install \
-  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?stable/ocata \
-  {opts} {packages}
+install_command = pip install {opts} {packages}
 commands = nosetests --with-xunit \
   --with-coverage \
   --cover-tests \
@@ -31,6 +29,7 @@ commands = flake8
 basepython = python2.7
 whitelist_externals = bash
 modules =
+  functest.api
   functest.core
   functest.opnfv_tests.sdn.odl
   functest.tests.unit.core