summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjulien zhang <zhang.jun3g@zte.com.cn>2017-09-10 14:47:26 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-10 14:47:26 +0000
commit96de9387460091e7cf0dc5fde1afaa637a8b2b79 (patch)
tree9198273d63ed4cd7d6bcfc6b29c902b1dc5e0fc2
parent7c96fb6cb02a5bb8f957f7129bf6149e07dfa8c2 (diff)
parent9fb5b2da2ba6544e1c47c2e7f19e5b2ceb178eb5 (diff)
Merge "Update heat-translator requirement"
-rw-r--r--tosca2heat/heat-translator/requirements.txt3
-rw-r--r--tosca2heat/heat-translator/tox.ini2
2 files changed, 3 insertions, 2 deletions
diff --git a/tosca2heat/heat-translator/requirements.txt b/tosca2heat/heat-translator/requirements.txt
index 2de8022..b147d83 100644
--- a/tosca2heat/heat-translator/requirements.txt
+++ b/tosca2heat/heat-translator/requirements.txt
@@ -7,7 +7,8 @@ cliff>=2.6.0 # Apache-2.0
PyYAML>=3.10.0 # MIT
python-dateutil>=2.4.2 # BSD
six>=1.9.0 # MIT
-tosca-parser>=0.8.1 # Apache-2.0
+#tosca-parser>=0.8.1 # Apache-2.0
+nfv-toscaparser>=0.5.0
keystoneauth1>=2.21.0 # Apache-2.0
python-novaclient>=9.0.0 # Apache-2.0
python-heatclient>=1.6.1 # Apache-2.0
diff --git a/tosca2heat/heat-translator/tox.ini b/tosca2heat/heat-translator/tox.ini
index b1299bf..6ba58c3 100644
--- a/tosca2heat/heat-translator/tox.ini
+++ b/tosca2heat/heat-translator/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
[testenv]
usedevelop = True
-install_command = pip install -U {opts} {packages}
+install_command = pip install --pre -U {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt