From: shangxdy <shang.xiaodong@zte.com.cn>
Date: Thu, 7 Sep 2017 02:40:13 +0000 (+0800)
Subject: Update heat-translator requirement
X-Git-Tag: opnfv-5.1.0~12^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F41255%2F2;p=parser.git

Update heat-translator requirement

Currently heat-translator use openstack tosca-parser other than
nfv-toscaparser, this patch modifies the requriement since nfv-toscaparser
has tagged and published to pypi.

JIRA: PARSER-150

Change-Id: Ib1ddf28f0932fbe19f25627ad4ef5df2d16dca0a
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
---

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