diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-02-29 09:19:18 +0100 |
|---|---|---|
| committer | Christian Heimes <cheimes@redhat.com> | 2016-02-29 16:11:08 +0100 |
| commit | 6c82500627b5c2e0602312faefba97fbe15044b9 (patch) | |
| tree | 6304ee9a873eb3e04d51b47ea406d1c4c5e63b91 /tox.ini | |
| parent | bcd8373696d6a1262234dd4d17874ac56107b381 (diff) | |
| download | pki-6c82500627b5c2e0602312faefba97fbe15044b9.tar.gz pki-6c82500627b5c2e0602312faefba97fbe15044b9.tar.xz pki-6c82500627b5c2e0602312faefba97fbe15044b9.zip | |
Fedora 24 fixes for Python 3.5 and pylint 1.5
Fedora 24 has Python 3.5 instead of Python 3.4. tox.ini now uses python3
to use any Python 3 interpreter.
Python 3.5 has unittest.mock in the stdlib. Tests must attempt to import
mock from unittest first.
Pylint 1.5 has deprecated a couple of old options. Dogtag doesn't use
the options anyway. I just removed them from dogtag.pylintrc.
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -19,7 +19,8 @@ # [tox] -envlist = py27,pep8,pep8py3,lint,lint3k,docs +envlist = py27,py35,pep8,pep8py3,lint,lint3k,docs +skip_missing_interpreters = true [testenv] # force installation of sphinx and lint in virtual env, otherwise @@ -51,7 +52,7 @@ commands = {envpython} {toxinidir}/scripts/pylint-build-scan.py tox -- --py3k [testenv:lint3] -basepython = python3.4 +basepython = python3 deps = pylint commands = @@ -68,7 +69,7 @@ commands = flake8 {posargs} [testenv:pep8py3] -basepython = python3.4 +basepython = python3 sitepackages = False deps = flake8 |