From 5b3dba0c87bcfebbf855681bae7ddbb19438cdaa Mon Sep 17 00:00:00 2001
From: maaoyu <maaoyu@inspur.com>
Date: Mon, 12 Oct 2020 11:09:52 +0800
Subject: Mark support for py38

in 'wallaby' cycle, we should test py38 by default.
Also support tox test on py36 and py38 as that's what
our check job verify on.
ref:
  https://governance.openstack.org/tc/reference/runtimes/victoria.html

Change-Id: I349d80cb1b963bdb30e374994f7c18352f918e3b
---
 heat_cfntools/cfntools/cfn_helper.py | 2 +-
 setup.cfg                            | 1 +
 tox.ini                              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/heat_cfntools/cfntools/cfn_helper.py b/heat_cfntools/cfntools/cfn_helper.py
index 4490e6c..decb5d0 100644
--- a/heat_cfntools/cfntools/cfn_helper.py
+++ b/heat_cfntools/cfntools/cfn_helper.py
@@ -311,7 +311,7 @@ class RpmHelper(object):
         Arguments:
             pkg -- A package name
         """
-        cmd = "rpm -q --queryformat '%{VERSION}-%{RELEASE}' %s" % pkg
+        cmd = "rpm -q --queryformat '%%{VERSION}-%%{RELEASE}' %s" % pkg
         command = CommandRunner(cmd).run()
         return command.stdout
 
diff --git a/setup.cfg b/setup.cfg
index c0d63a0..64536b7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 16f920d..fb1208a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,pep8
+envlist = py36,py37,py38,pep8
 ignore_basepython_conflict = true
 
 [testenv]
-- 
cgit v1.2.1