From 96614052e8e918bb681d18978c540816a8b4884f Mon Sep 17 00:00:00 2001
From: Huang Rui <bjhuangr@cn.ibm.com>
Date: Tue, 2 Jan 2024 18:11:35 +0800
Subject: [PATCH] fix pep8 error

Change-Id: I2ffbd131051676a5e28f80a6ea2ccc120362c7a8
---
 .gitignore                                   |  3 ++-
 ceilometer_zvm/compute/virt/zvm/inspector.py |  1 -
 requirements.txt                             | 14 +++++++-------
 setup.cfg                                    |  7 +++++--
 test-requirements.txt                        | 19 ++++++++-----------
 tox.ini                                      | 20 ++++++++++----------
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf8ef3e..597018c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .pydevproject
 .python-version
 .settings/
+.stestr/
 .testrepository/
 .tox/
 .venv
@@ -14,4 +15,4 @@ ceilometer_zvm.egg-info/
 dist/
 doc/build/
 AUTHORS
-ChangeLog
\ No newline at end of file
+ChangeLog
diff --git a/ceilometer_zvm/compute/virt/zvm/inspector.py b/ceilometer_zvm/compute/virt/zvm/inspector.py
index 0d6c475..1a862d0 100644
--- a/ceilometer_zvm/compute/virt/zvm/inspector.py
+++ b/ceilometer_zvm/compute/virt/zvm/inspector.py
@@ -14,7 +14,6 @@
 
 
 import six
-import time
 
 from ceilometer.compute.virt import inspector as virt_inspector
 from ceilometer.i18n import _
diff --git a/requirements.txt b/requirements.txt
index b9c1402..712243b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
+ceilometer
 eventlet>=0.17.4
-oslo.concurrency>=2.3.0                 # Apache-2.0
-oslo.config>=2.1.0                     # Apache-2.0
-oslo.i18n>=1.5.0                        # Apache-2.0
-oslo.log>=1.8.0                         # Apache-2.0
-oslo.service>=0.6.0                     # Apache-2.0
-pbr==2.0.0
-six>=1.9.0
+oslo.concurrency>=3.29.0 # Apache-2.0
+oslo.config>=8.6.0 # Apache-2.0
+oslo.i18n>=3.15.3 # Apache-2.0
+oslo.log>=3.36.0 # Apache-2.0
+#oslo.service>=0.6.0                     # Apache-2.0
+pbr>=2.0.0
 zVMCloudConnector>=0.3.5  # Apache 2.0 License
diff --git a/setup.cfg b/setup.cfg
index ae4fd75..7b81cb7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,8 +11,11 @@ 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 :: Implementation :: CPython
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 packages =
diff --git a/test-requirements.txt b/test-requirements.txt
index 99a42e1..93b7e8d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,12 +1,9 @@
-hacking<0.11,>=0.10.0
-coverage>=3.6
-discover
-fixtures>=1.3.1
-python-subunit>=0.0.18
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+coverage!=4.4,>=4.0 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
+flake8
+oslotest>=3.8.0 # Apache-2.0
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=2.2.0 # MIT
+stestr>=2.0.0 # Apache-2.0
+testresources>=2.0.1 # Apache-2.0
 mock>=1.2
diff --git a/tox.ini b/tox.ini
index f48f3b7..59a479d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,16 @@
 [tox]
-minversion = 1.6
-envlist = pep8,py27,py36,py37,py38
+minversion = 3.18.0
+envlist = pep8,py{38,39}
 skipsdist = True
 
 [testenv]
 whitelist_externals = *
 usedevelop = True
-install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       -egit+https://github.com/openstack/ceilometer@master#egg=ceilometer
-commands = /bin/cp -r {toxinidir}/ceilometer_zvm/compute/virt/zvm \
-           {toxinidir}/.tox/{envname}/src/ceilometer/ceilometer/compute/virt/
-           python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --test-path {toxinidir}/ceilometer_zvm/tests {posargs}
 
 [testenv:pep8]
 commands = flake8
@@ -23,12 +19,16 @@ commands = flake8
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py testr --coverage --testr-args='{posargs}'
+setenv =
+    PYTHON=coverage run --parallel-mode
+commands =
+    stestr run --test-path {toxinidir}/ceilometer_zvm/tests {posargs}
+    coverage combine
+    coverage html -d cover
 
 [flake8]
-ignore = E126,E127,E128,E129
+ignore = E123,E126,E127,E128,E129,W503,W504
 exclude =  .venv,.git,.tox,dist,doc,*egg,build
 
 [hacking]
 import_exceptions = nova.i18n
-