Merge "Temporary revert to install ht and tp with pip"

devstack/lib/download_upper_consts

@@ -13,4 +13,6 @@ function download_upper_constraints_file {
         > upper-constraints.txt
 }
 
-download_upper_constraints_file
+# TODO(yasufum) Uncomment if install tosca-parser and heat-translator from git
+#     repo.
+# download_upper_constraints_file

devstack/plugin.sh

@@ -20,9 +20,9 @@ if is_service_enabled tacker; then
         # for development.
         # If you install pip packages instead, comment out here, and activate
         # entries in `requirements.txt` and `lower-constraints.txt`.
-        install_package_local_repo tosca-parser
-        install_package_local_repo heat-translator
-        . $DEST/tacker/devstack/lib/download_upper_consts
+        #install_package_local_repo tosca-parser
+        #install_package_local_repo heat-translator
+        #. $DEST/tacker/devstack/lib/download_upper_consts
 
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         # Configure after the other layer 1 and 2 services have been configured

lower-constraints.txt

@@ -160,5 +160,5 @@ wrapt==1.10.11
 # but the latest revision from git repo for development.
 # If you install packages, comment out two lines of `install_package_gitrepo` in
 # `devstack/plugin.sh` in addition to activate following lines.
-#heat-translator==2.0.0 # Apache-2.0
-#tosca-parser==1.6.1 # Apache-2.0
+heat-translator==2.2.0 # Apache-2.0
+tosca-parser==2.3.0 # Apache-2.0

requirements-extra.txt

@@ -4,5 +4,5 @@
 # `tox -e lower-constraints` and it's failed  if it's defined in
 # `requirements.txt`.
 
--e git+https://opendev.org/openstack/tosca-parser.git#egg=tosca-parser # Apache-2.0
--e git+https://opendev.org/openstack/heat-translator.git#egg=heat-translator # Apache-2.0
+#-e git+https://opendev.org/openstack/tosca-parser.git#egg=tosca-parser # Apache-2.0
+#-e git+https://opendev.org/openstack/heat-translator.git#egg=heat-translator # Apache-2.0

requirements.txt

@@ -60,5 +60,5 @@ glance-store>=2.4.0 # Apache-2.0
 # but the latest revision from git repo for development.
 # If you install packages, comment out two lines of `install_package_gitrepo` in
 # `devstack/plugin.sh` in addition to activate following lines.
-#heat-translator>=2.0.0 # Apache-2.0
-#tosca-parser>=1.6.1 # Apache-2.0
+heat-translator>=2.2.0 # Apache-2.0
+tosca-parser>=2.3.0 # Apache-2.0

tox.ini

@@ -15,15 +15,15 @@ setenv = VIRTUAL_ENV={envdir}
          OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
          OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}
          OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
-         TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt
+#         TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt
 passenv = TOX_CONSTRAINTS_FILE
 usedevelop = True
 allowlist_externals = rm
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
-  -r{toxinidir}/requirements-extra.txt
   -r{toxinidir}/test-requirements.txt
+#  -r{toxinidir}/requirements-extra.txt
 commands =
    stestr run --slowest --concurrency 1 {posargs}
 
@@ -87,7 +87,7 @@ commands = python ./tools/check_i18n.py ./tacker
 
 [testenv:docs]
 deps = -r{toxinidir}/doc/requirements.txt
-       -r{toxinidir}/requirements-extra.txt
+#       -r{toxinidir}/requirements-extra.txt
 commands =
   sphinx-build -W -b html doc/source doc/build/html
   oslopolicy-sample-generator --config-file=etc/tacker-policy-generator.conf
@@ -107,7 +107,7 @@ commands =
 [testenv:cover]
 setenv =
     PYTHON=coverage run --source tacker --parallel-mode
-    TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt
+#    TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt
 commands =
     stestr run {posargs}
     coverage combine
@@ -148,7 +148,7 @@ deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-  -r{toxinidir}/requirements-extra.txt
+#  -r{toxinidir}/requirements-extra.txt
 
 [testenv:bindep]
 # Do not install any requirements. We want this to be fast and work even if