From d013b37066f8f554acb389779c476fea146a214e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 8 Jun 2022 08:14:16 +0900
Subject: [PATCH] Update python testing as per zed cycle testing runtime

In Zed cycle, we have dropped the python 3.6/3.7[1] testing
and its support. Add release notes and update the python
classifier for the same.

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

Co-Authored-By: Ghanshyam Mann <gmann@ghanshyammann.com>
Change-Id: I998b34f884a2869d46ff05a179708a7f775e1615
---
 .zuul.yaml                                             |  4 ----
 .../drop-python-3-6-and-3-7-c3d8c440800ed885.yaml      |  5 +++++
 setup.cfg                                              |  4 +---
 tox.ini                                                | 10 ----------
 4 files changed, 6 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/drop-python-3-6-and-3-7-c3d8c440800ed885.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 0484576f8..42e965e91 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,8 +15,6 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-tox-functional-py36
-        - openstack-tox-functional-py37
         - openstack-tox-functional-py38
         - openstack-tox-functional-py39
         - openstack-tox-pep8
@@ -48,8 +46,6 @@
             irrelevant-files: *gate-irrelevant-files
     gate:
       jobs:
-        - openstack-tox-functional-py36
-        - openstack-tox-functional-py37
         - openstack-tox-functional-py38
         - openstack-tox-functional-py39
         - openstack-tox-pep8
diff --git a/releasenotes/notes/drop-python-3-6-and-3-7-c3d8c440800ed885.yaml b/releasenotes/notes/drop-python-3-6-and-3-7-c3d8c440800ed885.yaml
new file mode 100644
index 000000000..db420d739
--- /dev/null
+++ b/releasenotes/notes/drop-python-3-6-and-3-7-c3d8c440800ed885.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.
diff --git a/setup.cfg b/setup.cfg
index c4d39dc3c..3779be702 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,7 +12,7 @@ project_urls =
     API Reference = https://docs.openstack.org/api-ref/placement/
     Source Code = https://opendev.org/openstack/placement
     Release Notes = https://docs.openstack.org/releasenotes/placement/
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Development Status :: 5 - Production/Stable
     Environment :: OpenStack
@@ -24,8 +24,6 @@ classifier =
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
 
diff --git a/tox.ini b/tox.ini
index 2ebc43cac..9449fb5b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,16 +39,6 @@ passenv =
 commands =
   stestr --test-path=./placement/tests/functional run {posargs}
 
-[testenv:functional-py36]
-envdir = {toxworkdir}/py36
-commands =
-  {[testenv:functional]commands}
-
-[testenv:functional-py37]
-envdir = {toxworkdir}/py37
-commands =
-  {[testenv:functional]commands}
-
 [testenv:functional-py38]
 envdir = {toxworkdir}/py38
 commands =