From: Kefu Chai <kchai@redhat.com>
Date: Fri, 19 Jun 2020 10:44:57 +0000 (+0800)
Subject: qa: drop flake8-py2 test
X-Git-Tag: v16.1.0~1962^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c02748c8df0cb76fdf1bc3fd504d58d22718c2b2;p=ceph.git

qa: drop flake8-py2 test

as we've dropped py2 support, no need to run flake8 with python2
anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/CMakeLists.txt b/qa/CMakeLists.txt
index f7630ce0528b..6d06fe9ea3df 100644
--- a/qa/CMakeLists.txt
+++ b/qa/CMakeLists.txt
@@ -5,5 +5,5 @@ endif()
 
 if(WITH_TESTS)
   include(AddCephTest)
-  add_tox_test(qa TOX_ENVS flake8-py3 import-tasks)
+  add_tox_test(qa TOX_ENVS flake8 import-tasks)
 endif()
diff --git a/qa/tox.ini b/qa/tox.ini
index a2ad79b64b31..1b54ca0af3b4 100644
--- a/qa/tox.ini
+++ b/qa/tox.ini
@@ -1,14 +1,8 @@
 [tox]
-envlist = flake8-py2, flake8-py3, mypy, pytest
+envlist = flake8, mypy, pytest
 skipsdist = True
 
-[testenv:flake8-py2]
-basepython = python2
-deps=
-  flake8
-commands=flake8 --select=F,E9 --exclude=venv,.tox
-
-[testenv:flake8-py3]
+[testenv:flake8]
 basepython = python3
 deps=
   flake8