diff options
| author | Stephen Finucane <stephen@that.guru> | 2020-02-27 23:13:54 +0000 |
|---|---|---|
| committer | Stephen Finucane <stephen@that.guru> | 2020-02-27 23:17:32 +0000 |
| commit | eee67b4bb4976a881a79f3bfcf15cc57fefc7d6e (patch) | |
| tree | fc3fb64c1687b9cb6645b7378cdc808e842720cf | |
| parent | 5b904f91c4cab1ff3f8460c9d4ed920a990c8db3 (diff) | |
| download | patchwork-eee67b4bb4976a881a79f3bfcf15cc57fefc7d6e.tar patchwork-eee67b4bb4976a881a79f3bfcf15cc57fefc7d6e.tar.gz | |
tox: Switch non-pyNN targets to Python 3
This is long overdue and highlights a small issue, which is easily fixed
by use of Sphinx.
Signed-off-by: Stephen Finucane <stephen@that.guru>
| -rw-r--r-- | patchwork/parser.py | 7 | ||||
| -rw-r--r-- | tox.ini | 9 |
2 files changed, 5 insertions, 11 deletions
diff --git a/patchwork/parser.py b/patchwork/parser.py index 5d86426..0e88d93 100644 --- a/patchwork/parser.py +++ b/patchwork/parser.py @@ -160,12 +160,7 @@ def clean_header(header): if sane_header is None: return None - # on Py2, we want to do unicode(), on Py3, str(). - # That gets us the decoded, un-wrapped header. - if six.PY2: - header_str = unicode(sane_header) - else: - header_str = str(sane_header) + header_str = six.text_type(sane_header) return normalise_space(header_str) @@ -1,9 +1,11 @@ [tox] -minversion = 2.0 +minversion = 3.2 envlist = pep8,docs,py27-django111,py{35,36,37,38}-django{111,20,21,22} -skipsdist = True +skipsdist = true +ignore_basepython_conflict = true [testenv] +basepython = python3 deps = -r{toxinidir}/requirements-test.txt django111: django>=1.11,<2.0 @@ -42,7 +44,6 @@ commands = -name \*.sh -print | xargs bashate -i E006" [testenv:pep8] -basepython = python2.7 deps = flake8 commands = flake8 {posargs:patchwork manage.py} @@ -62,7 +63,6 @@ commands = sphinx-build -E -W -b dirhtml -d docs/_build/doctrees docs docs/_build/html [testenv:lint] -basepython = python2.7 deps = pylint -r{toxinidir}/requirements-prod.txt @@ -72,7 +72,6 @@ commands = pylint patchwork --rcfile=pylint.rc commands = {posargs} [testenv:coverage] -basepython = python2.7 deps = coverage -r{toxinidir}/requirements-dev.txt |