From 771c922af5ec851b4a56de989505ce6660b06bbb Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Fri, 27 Mar 2020 19:35:37 +0200
Subject: [PATCH] Clarify python trove classifiers

+ fix unittest for python 3.8

Change-Id: If8bcae9d0ec985c9c22b12f5a8f399e227939d73
---
 .zuul.d/zuul.yaml      | 2 ++
 CHANGELOG.rst          | 2 ++
 setup.cfg              | 6 ++----
 tests/unit/test_ddt.py | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index be72355e..8b63d562 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -5,6 +5,7 @@
         - rally-tox-pep8
         - rally-tox-py36
         - rally-tox-py37
+        - rally-tox-py38
         - rally-dsvm-tox-functional
         - rally-docker-check
         - rally-task-basic-with-existing-users:
@@ -64,6 +65,7 @@
         - rally-tox-pep8
         - rally-tox-py36
         - rally-tox-py37
+        - rally-tox-py38
         - rally-dsvm-tox-functional
         - rally-docker-check
         - rally-task-simple-job
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 92f80ca8..6179ea99 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -25,6 +25,8 @@ Added
 * The *rally_openstack.task.context.OpenStackContext* class which provides
   helpers for all OpenStack context.
 
+* Declare Python 3.8 support
+
 Changed
 ~~~~~~~
 
diff --git a/setup.cfg b/setup.cfg
index 5dbd91ad..3a8b6478 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,12 +15,10 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
 
 [files]
 packages =
diff --git a/tests/unit/test_ddt.py b/tests/unit/test_ddt.py
index 91a10f71..edb34c0a 100644
--- a/tests/unit/test_ddt.py
+++ b/tests/unit/test_ddt.py
@@ -68,13 +68,13 @@ class DDTDecoratorChecker(ast.NodeVisitor):
                            "but is not decorated with `ddt.ddt`" %
                            cls.name)
                     self.errors[cls.name] = {
-                        "lineno": node.lineno,
+                        "lineno": decorator.lineno,
                         "message": msg
                     }
 
 
 class DDTDecoratorCheckerTestCase(test.TestCase):
-    tests_path = os.path.join(os.path.dirname(__file__))
+    tests_path = os.path.dirname(__file__)
 
     def test_ddt_class_decorator(self):
         """Classes with DDT-decorated functions have ddt.ddt class decorator.