summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaaoyu <maaoyu@inspur.com>2020-10-12 11:09:52 +0800
committerricolin <rico.lin.guanyu@gmail.com>2020-11-16 13:26:58 +0800
commit5b3dba0c87bcfebbf855681bae7ddbb19438cdaa (patch)
tree1e2134bd6ed1b64bcb48ad74d3ecbe7e14dec978
parent22068fb533a793ccef2f097cf2a1b123fd5813ee (diff)
downloadheat-cfntools-5b3dba0c87bcfebbf855681bae7ddbb19438cdaa.tar.gz
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
-rw-r--r--heat_cfntools/cfntools/cfn_helper.py2
-rw-r--r--setup.cfg1
-rw-r--r--tox.ini2
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]