From 0868e5cc554afa6cbda3d7ba44cbe4bc3147d8ca Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Sun, 20 Aug 2023 11:26:07 +0200
Subject: [PATCH] Drop support of py36 and py37

Change-Id: I16e4c61c8b166d5e128907d79ab6f857f98bd82b
---
 .zuul.d/zuul.yaml |  4 ----
 CHANGELOG.rst     |  7 +++++++
 setup.cfg         |  6 +++---
 tox.ini           | 11 ++++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 9bc3d0a1..0a516b69 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -3,8 +3,6 @@
       jobs:
         - rally-tox-cover
         - rally-tox-pep8
-        - rally-tox-py36
-        - rally-tox-py37
         - rally-tox-py38
         - rally-tox-py39
         - rally-tox-py310
@@ -85,8 +83,6 @@
       jobs:
         - rally-tox-cover
         - rally-tox-pep8
-        - rally-tox-py36
-        - rally-tox-py37
         - rally-tox-py38
         - rally-tox-py39
         - rally-tox-py310
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index abef6c9a..59171127 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -16,6 +16,13 @@ Changelog
 .. Release notes for existing releases are MUTABLE! If there is something that
    was missed or can be improved, feel free to change it!
 
+unreleased
+----------
+
+Removed
+~~~~~~~
+
+Support of Python 3.6 and Python 3.7
 
 [2.3.0] - 2023-08-01
 --------------------
diff --git a/setup.cfg b/setup.cfg
index 977a9b46..4d441723 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,7 @@ author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/rally/latest/
 license = Apache License, Version 2.0
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Developers
@@ -17,9 +17,9 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index c7e4c34e..98af474d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.1.1
 ignore_basepython_conflict = true
-envlist = py36,py37,py38,pep8
+envlist = py38,py39,py310,pep8
 
 [testenv]
 extras = {env:RALLY_EXTRAS:}
@@ -40,18 +40,15 @@ skip_install = true
 commands = flake8
 distribute = false
 
-[testenv:py36]
-basepython = python3.6
-
-[testenv:py37]
-basepython = python3.7
-
 [testenv:py38]
 basepython = python3.8
 
 [testenv:py39]
 basepython = python3.9
 
+[testenv:py310]
+basepython = python3.10
+
 [testenv:venv]
 basepython = python3
 commands = {posargs}