From c9834223550f796d053c4e78a4ed81e4c080ba96 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 15 Oct 2023 04:19:34 +0900
Subject: [PATCH] Run tosca-parser tests with Python 3.10

... because Python 3.7 is no longer tested. Python 3.10 is selected
from the supported runtime versions because it's the default python
version in Ubuntu Jammy.

This also fixes a few problems causing failure in the test.

Change-Id: Ida855a8438fe980998240c5f09cf7826b9ca78dc
---
 .zuul.yaml            | 8 ++++----
 test-requirements.txt | 3 +++
 tox.ini               | 8 +++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 611989a9..162a5edb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,11 +10,11 @@
             voting: false
 
 - job:
-    name: heat-translator-tox-py37-tp
-    parent: openstack-tox-py37
+    name: heat-translator-tox-py310-tp
+    parent: openstack-tox-py310
     description: |
       Run tests for heat-translator project.
 
-      Uses tox with the ``py37-tp`` environment.
+      Uses tox with the ``py310-tp`` environment.
     vars:
-      tox_envlist: py37-tp
+      tox_envlist: py310-tp
diff --git a/test-requirements.txt b/test-requirements.txt
index c1aad15c..4454ebd7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,3 +9,6 @@ python-subunit>=1.0.0 # Apache-2.0/BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
+# TODO(tkajinam): Remove this once the following fix is released.
+#                 https://github.com/testing-cabal/testrepository/pull/48
+extras>=1.0.0 # MIT
diff --git a/tox.ini b/tox.ini
index 9f2694ff..bf52dcf9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,10 +43,12 @@ commands =
     oslo_debug_helper -t translator/hot/tests {posargs}
     oslo_debug_helper -t translator/hot/tosca/tests {posargs}
 
-[testenv:py37-tp]
-basepython = python37
+[testenv:py310-tp]
+basepython = python310
+allowlist_externals =
+    bash
 commands =
-    ./run_py-tosca-parser-master.sh
+    bash ./run_py-tosca-parser-master.sh
     python setup.py test --slowest --testr-args='{posargs}'
 
 [flake8]