From 57f239cc4d5af80f7b50ecf00d4b823f76d8be43 Mon Sep 17 00:00:00 2001
From: LeopardMa <mabao@inspur.com>
Date: Sat, 4 Jun 2022 15:47:30 +0800
Subject: [PATCH] Update python testing as per zed cycle teting runtime

In Zed cycle, we have dropped the python 3.6/3.7[1] testing
and its support. Removing the py36 centos8 job as well as
updating the python classifier also to reflect the same.

[1] https://governance.openstack.org/tc/reference/runtimes/zed.html

Change-Id: I253757e2035dbe667905f011f9d05cc5d94e669e
---
 .../notes/drop-python-3-6-and-3-7-3a90d172a5e43660.yaml      | 5 +++++
 setup.cfg                                                    | 4 +---
 tox.ini                                                      | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/drop-python-3-6-and-3-7-3a90d172a5e43660.yaml

diff --git a/releasenotes/notes/drop-python-3-6-and-3-7-3a90d172a5e43660.yaml b/releasenotes/notes/drop-python-3-6-and-3-7-3a90d172a5e43660.yaml
new file mode 100644
index 000000000..3d5e4e3d3
--- /dev/null
+++ b/releasenotes/notes/drop-python-3-6-and-3-7-3a90d172a5e43660.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Python 3.6 & 3.7 support has been dropped. The minimum version of Python now
+    supported is Python 3.8.
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 76733a843..27471992a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/senlin/latest/
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -16,8 +16,6 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
 
 [files]
diff --git a/tox.ini b/tox.ini
index 90050390b..57c0d6024 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,8 +44,8 @@ whitelist_externals =
 basepython = python3
 commands = oslo_debug_helper -t senlin/tests/unit {posargs}
 
-[testenv:debug-py36]
-basepython = python3.6
+[testenv:debug-py38]
+basepython = python3.8
 commands = oslo_debug_helper -t senlin/tests/unit {posargs}
 
 [testenv:pep8]