From: Stephen Finucane <stephen@that.guru>
Date: Thu, 27 Feb 2020 23:13:54 +0000 (+0000)
Subject: tox: Switch non-pyNN targets to Python 3
X-Git-Tag: v2.2.0-rc2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eee67b4bb4976a881a79f3bfcf15cc57fefc7d6e;p=thirdparty%2Fpatchwork.git

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>
---

diff --git a/patchwork/parser.py b/patchwork/parser.py
index 5d86426c..0e88d934 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)
 
diff --git a/tox.ini b/tox.ini
index 140c1924..1b6cadaa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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