From 3e80b04c1de37568d304b2d76f324c026830fd11 Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes@redhat.com>
Date: Fri, 31 Mar 2017 09:48:07 -0600
Subject: Misc pylint, flake8 and tox fixes

---
 tox.ini | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index f73818d9c..7b3d1fde3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,14 +19,23 @@
 #
 
 [tox]
-envlist = py27,py35,pep8,pep8py3,lint,lint3k,docs
+envlist = py27,py35,py36,,pep8,pep8py3,lint,lint3,docs
 skip_missing_interpreters = true
 
+[testenv:deps]
+deps =
+    lxml
+    pyldap
+    python-nss
+    requests
+    six
+
 [testenv]
 # force installation of sphinx and lint in virtual env, otherwise
 # the command pick up the `pki` package from the system's site packages.
 install_command = pip install {opts} --force-reinstall --upgrade {packages}
 deps =
+    {[testenv:deps]deps}
     pytest
 sitepackages = True
 commands =
@@ -40,28 +49,24 @@ commands =
 [testenv:lint]
 basepython = python2.7
 deps =
+    {[testenv:deps]deps}
     pylint
 commands =
-    {envpython} {toxinidir}/scripts/pylint-build-scan.py tox
-
-[testenv:lint3k]
-basepython = python2.7
-deps =
-    pylint
-commands =
-    {envpython} {toxinidir}/scripts/pylint-build-scan.py tox -- --py3k
+    {envpython} {toxinidir}/pylint-build-scan.py tox
 
 [testenv:lint3]
 basepython = python3
 deps =
+    {[testenv:deps]deps}
     pylint
 commands =
-    {envpython} {toxinidir}/scripts/pylint-build-scan.py tox
+    {envpython} {toxinidir}/pylint-build-scan.py tox
 
 [testenv:pep8]
 basepython = python2.7
 sitepackages = False
 deps =
+    {[testenv:deps]deps}
     flake8
     # flake8-import-order
     pep8-naming
@@ -72,6 +77,7 @@ commands =
 basepython = python3
 sitepackages = False
 deps =
+    {[testenv:deps]deps}
     flake8
     # flake8-import-order
     pep8-naming
-- 
cgit