summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalentin boucher <valentin.boucher@orange.com>2017-05-22 13:12:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-22 13:12:55 +0000
commitcfe41e13b6de3c71e963f2bb8cd574c19a84690d (patch)
tree563afeaaf4b145701b05cdb7b40604855db3300b
parent11e81955122f66f8d4d211fb81c1111af2eddbee (diff)
parent3b008aed434448a543611c73afa282596f8b3f5d (diff)
Merge "Check python3 support when running tox"
-rw-r--r--requirements.py3.txt39
-rw-r--r--tox.ini17
2 files changed, 52 insertions, 4 deletions
diff --git a/requirements.py3.txt b/requirements.py3.txt
new file mode 100644
index 000000000..6a003d532
--- /dev/null
+++ b/requirements.py3.txt
@@ -0,0 +1,39 @@
+#
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+pyyaml==3.10
+gitpython==1.0.1
+python-openstackclient==2.3.0
+python-ceilometerclient==2.6.2
+python-heatclient==1.7.0
+python-keystoneclient==3.5.0
+python-neutronclient==6.0.0
+python-novaclient==6.0.0
+python-congressclient==1.5.0
+python-tackerclient==0.7.0
+pexpect==4.0
+requests==2.9.1
+robotframework==3.0.2
+robotframework-httplibrary==0.4.2
+robotframework-requests==0.4.7
+jmespath==0.9.2
+configObj==5.0.6
+Flask==0.10.1
+xmltodict==0.9.2
+scp==0.10.2
+paramiko==2.1.2
+shyaml
+dnspython
+Pillow==3.3.0
+click==6.6
+openbaton-cli==2.2.1-beta7
+mock==1.3.0
+iniparse==0.4
+PrettyTable>=0.7.1,<0.8 # BSD
+six>=1.9.0 # MIT
+git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
+git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests
diff --git a/tox.ini b/tox.ini
index c59e46c37..4cd53b033 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = docs,pep8,pylint,py27
+envlist = docs,pep8,pylint,py35,py27
[testenv]
usedevelop = True
@@ -25,9 +25,18 @@ deps =
commands = flake8
[testenv:pylint]
-basepython=python2.7
-deps=
+basepython = python2.7
+deps =
{[testenv]deps}
whitelist_externals = bash
-commands=bash -c \
+commands = bash -c \
"pylint --persistent=n functest | sed -ne '/Raw metrics/,//p'"
+
+[testenv:py35]
+dirs =
+ functest/tests/unit/core
+ functest/tests/unit/odl
+deps =
+ -r{toxinidir}/requirements.py3.txt
+ -r{toxinidir}/test-requirements.txt
+commands = nosetests --exclude=test_vnf {[testenv:py35]dirs}