summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorChristian Heimes <cheimes@redhat.com>2017-03-31 09:48:07 -0600
committerMatthew Harmsen <mharmsen@redhat.com>2017-03-31 09:49:59 -0600
commit3e80b04c1de37568d304b2d76f324c026830fd11 (patch)
tree3313a9ad86c33d95afdb2226c8ce1502246f252c /tox.ini
parent5e4321ff0a55d854964a8765f3b61d60c50e2b45 (diff)
downloadpki-3e80b04c1de37568d304b2d76f324c026830fd11.tar.gz
pki-3e80b04c1de37568d304b2d76f324c026830fd11.tar.xz
pki-3e80b04c1de37568d304b2d76f324c026830fd11.zip
Misc pylint, flake8 and tox fixes
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini26
1 files changed, 16 insertions, 10 deletions
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