From db24e71f0a25e517657f36ad1fc8f7728d2c636f Mon Sep 17 00:00:00 2001
From: Kiefer Chang <kiefer.chang@suse.com>
Date: Wed, 23 Oct 2019 15:41:53 +0800
Subject: [PATCH] python-common: enable lint in tox tests

* Change tox env py35 and py36 to just py3.
* Use flake8 to lint code.
* Use rstcheck to lint rst files.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
---
 src/python-common/CMakeLists.txt        |  2 +-
 src/python-common/requirements-lint.txt |  2 ++
 src/python-common/tox.ini               | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 src/python-common/requirements-lint.txt

diff --git a/src/python-common/CMakeLists.txt b/src/python-common/CMakeLists.txt
index 0b178ae9c87c2..01d3bc582b3d5 100644
--- a/src/python-common/CMakeLists.txt
+++ b/src/python-common/CMakeLists.txt
@@ -13,5 +13,5 @@ endforeach()
 
 if(WITH_TESTS)
   include(AddCephTest)
-  add_tox_test(python-common)
+  add_tox_test(python-common TOX_ENVS lint)
 endif()
diff --git a/src/python-common/requirements-lint.txt b/src/python-common/requirements-lint.txt
new file mode 100644
index 0000000000000..2a7142182c239
--- /dev/null
+++ b/src/python-common/requirements-lint.txt
@@ -0,0 +1,2 @@
+flake8==3.7.8
+rstcheck==3.3.1
diff --git a/src/python-common/tox.ini b/src/python-common/tox.ini
index 96d5e0da8d703..5af1cc086b3f2 100644
--- a/src/python-common/tox.ini
+++ b/src/python-common/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, flake8
+envlist = py27, py3, lint
 skip_missing_interpreters = true
 
 [testenv]
@@ -7,12 +7,18 @@ deps=
   pytest
 commands=py.test -v {posargs:ceph/tests}
 
-[testenv:flake8]
-deps=flake8
-commands=flake8 {posargs:ceph}
-
 [tool:pytest]
 norecursedirs = .* _* virtualenv
 
 [flake8]
-select=F,E9
+max-line-length = 100
+exclude =
+    __pycache__
+
+[testenv:lint]
+deps = 
+    -rrequirements-lint.txt
+commands =
+    flake8 {posargs:ceph}
+    rstcheck --report info --debug README.rst
+
-- 
2.39.5