remove python 2.7 support (#211) => 3.0.0

* remove python 2.7 support
* remove six
* updage django versions
* remove python2 hacks
* bump major version 3.0.0

Author: dnozay

.travis.yml

@@ -4,14 +4,6 @@ cache: pip
 
 matrix:
   include:
-    - python: 2.7
-      env: TOXENV=py27
-    - python: 2.7
-      env: TOXENV=py27-djangolts
-    - python: 2.7
-      env: TOXENV=py27-djangocurr
-    - python: 2.7
-      env: TOXENV=quality
     - python: 3.5
       env: TOXENV=py35
     - python: 3.6
@@ -20,14 +12,14 @@ matrix:
       env: TOXENV=py37
     - python: 3.8
       env: TOXENV=py38
+    - python: 3.8
+      env: TOXENV=py38-djangolts
+    - python: 3.8
+      env: TOXENV=py38-djangocurr
+    - python: 3.8
+      env: TOXENV=quality
     - python: 3.8-dev
       env: TOXENV=pytest
-    - os: linux
-      dist: xenial
-      python: pypy2.7-6.0
-      env: TOXENV=pypy
-      services:
-        - docker
     - os: linux
       dist: xenial
       python: pypy3.5-6.0

README.md

@@ -39,7 +39,9 @@ in the reports for sub-tests.
 
 ## Requirements
 
-* Python 2.7 or 3.3+
+* Python 3.5+
+* Please note Python 2.7 end-of-life was in Jan 2020, last version supporting 2.7 was 2.5.2
+* Please note Python 3.4 end-of-life was in Mar 2019, last version supporting 3.4 was 2.5.2
 * Please note Python 2.6 end-of-life was in Oct 2013, last version supporting 2.6 was 1.14.0
 
 ## Installation

setup.py

@@ -15,13 +15,10 @@
 with codecs.open(readme_path, 'rb', 'utf8') as readme_file:
     long_description = readme_file.read()
 
-install_requires = ['six>=1.4.0']
-
 # this is for sdist to work.
 import sys
-if sys.version_info < (2, 7):
-    # python 2.6 no longer supported, use last 1.x release instead.
-    raise RuntimeError('This version requires Python 2.7+')  # pragma: no cover
+if sys.version_info < (3, 5):
+    raise RuntimeError('This version requires Python 3.5+')  # pragma: no cover
 
 setup(
     name = 'unittest-xml-reporting',
@@ -57,6 +54,5 @@
     packages = ['xmlrunner', 'xmlrunner.extra'],
     zip_safe = False,
     include_package_data = True,
-    install_requires = install_requires,
     test_suite = 'tests'
 )

tests/builder_test.py

@@ -6,7 +6,6 @@
 from xml.dom.minidom import Document
 
 from xmlrunner import builder
-import six
 
 
 class TestXMLContextTest(unittest.TestCase):
@@ -27,9 +26,9 @@ def test_current_context_name(self):
         self.assertEqual(name, 'context-name')
 
     def test_current_context_invalid_unicode_name(self):
-        self.root.begin('tag', six.u('context-name\x01\x0B'))
+        self.root.begin('tag', u'context-name\x01\x0B')
         name = self.root.element.getAttribute('name')
-        self.assertEqual(name, six.u('context-name\uFFFD\uFFFD'))
+        self.assertEqual(name, u'context-name\uFFFD\uFFFD')
 
     def test_increment_valid_testsuites_counters(self):
         self.root.begin('testsuites', 'name')
@@ -99,10 +98,10 @@ def setUp(self):
         self.doc = self.builder._xml_doc
         self.builder.begin_context('testsuites', 'name')
 
-        self.valid_chars = six.u('выбор')
+        self.valid_chars = u'выбор'
 
         self.invalid_chars = '\x01'
-        self.invalid_chars_replace = six.u('\ufffd')
+        self.invalid_chars_replace = u'\ufffd'
 
     def test_root_has_no_parent(self):
         self.assertIsNone(self.builder.current_context().parent)

tests/django_test.py

@@ -4,10 +4,7 @@
 import os
 from os import path
 import glob
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 import tempfile
 import shutil
 
@@ -19,6 +16,7 @@
     from django.test.utils import get_runner
     from django.conf import settings, UserSettingsHolder
     from django.apps import apps
+    settings.configure(DEBUG=True)
 
 
 TESTS_DIR = path.dirname(__file__)
@@ -37,6 +35,7 @@ def setUp(self):
         self.old_settings = settings._wrapped
         os.environ['DJANGO_SETTINGS_MODULE'] = 'example.settings'
         settings.INSTALLED_APPS  # load settings on first access
+        settings.DATABASES['default'] = {}
         settings.DATABASES['default']['NAME'] = path.join(
             self.tmpdir, 'db.sqlilte3')
         # this goes around the "settings already loaded" issue.

tests/testsuite.py

@@ -15,7 +15,7 @@
 from xmlrunner.result import _XMLTestResult
 import doctest
 import tests.doctest_example
-from six import StringIO, BytesIO, exec_
+from io import StringIO, BytesIO
 from tempfile import mkdtemp
 from tempfile import mkstemp
 from shutil import rmtree
@@ -24,11 +24,7 @@
 from lxml import etree
 import os
 import os.path
-
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 
 def _load_schema():
@@ -114,7 +110,7 @@ def wrapper(*args, **kwargs):
     return func(*args, **kwargs)
 """
     evaldict = dict(func=f)
-    exec_(code, evaldict)
+    exec(code, evaldict)
     return evaldict['wrapper']
 
 
@@ -402,21 +398,13 @@ def _xmlrunner_non_ascii_failures(self, buffer=False):
 
         # allow output non-ascii letters to stdout
         orig_stdout = sys.stdout
-        if getattr(sys.stdout, 'buffer', None):
-            # Python3
-            sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
-        else:
-            # Python2
-            import codecs
-            sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
+        sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
 
         try:
             runner.run(suite)
         finally:
-            if getattr(sys.stdout, 'buffer', None):
-                # Python3
-                # Not to be closed when TextIOWrapper is disposed.
-                sys.stdout.detach()
+            # Not to be closed when TextIOWrapper is disposed.
+            sys.stdout.detach()
             sys.stdout = orig_stdout
         outdir.seek(0)
         output = outdir.read()
@@ -835,10 +823,7 @@ def test_test_program_fail_wo_buffer(self):
         self.assertNotIn('should be printed', r[1].getvalue())
 
     def test_partialmethod(self):
-        try:
-            from functools import partialmethod
-        except ImportError:
-            raise unittest.SkipTest('functools.partialmethod is not available.')
+        from functools import partialmethod
         def test_partialmethod(test):
             pass
         class TestWithPartialmethod(unittest.TestCase):

tox.ini

@@ -4,25 +4,23 @@ testpaths = tests
 norecursedirs = tests/django_example
 
 [tox]
-envlist = begin,py{27,py,py3,35,36,37},pytest,py27-django{lts,curr},end,quality
+envlist = begin,py{py,py3,35,36,37,38},pytest,py38-django{lts,curr},end,quality
 
 [tox:travis]
-2.7 = begin,py27,py27-django{lts,curr},end,quality
 3.5 = py35
 3.6 = py36
 3.7 = py37,pytest
-3.8 = py38
+3.8 = begin,py38,py38-django{lts,curr},end,quality
 
 [testenv]
 deps =
     coverage
     codecov>=1.4.0
     coveralls
-    djangolts,pytest: django>=1.8.8,<1.9.0
-    djangocurr: django>=1.9.1
+    djangolts,pytest: django>=1.11.0,<1.12.0
+    djangocurr: django>=2.2.0
     pytest: pytest
     lxml>=3.6.0
-    mock
 commands =
     coverage run --append setup.py test
     coverage report --omit='.tox/*'

xmlrunner/builder.py

@@ -2,7 +2,6 @@
 import sys
 import datetime
 import time
-import six
 
 from xml.dom.minidom import Document
 
@@ -20,18 +19,18 @@
 _char_tail = ''
 
 if sys.maxunicode > 0x10000:
-    _char_tail = six.u('%s-%s') % (
-        six.unichr(0x10000),
-        six.unichr(min(sys.maxunicode, 0x10FFFF))
+    _char_tail = (u'%s-%s') % (
+        chr(0x10000),
+        chr(min(sys.maxunicode, 0x10FFFF))
     )
 
 _nontext_sub = re.compile(
-    six.u(r'[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD%s]') % _char_tail,
+    r'[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD%s]' % _char_tail,
     re.U
 ).sub
 
 
-def replace_nontext(text, replacement=six.u('\uFFFD')):
+def replace_nontext(text, replacement=u'\uFFFD'):
     return _nontext_sub(replacement, text)
 
 
@@ -104,7 +103,7 @@ def _set_result_counters(self):
                 )
 
             if valid_counter_for_element:
-                value = six.text_type(
+                value = str(
                     self.counters.get(counter_name, 0)
                 )
                 self.element.setAttribute(counter_name, value)
@@ -192,7 +191,7 @@ def append(self, tag, content, **kwargs):
         element = self._xml_doc.createElement(tag)
 
         for key, value in kwargs.items():
-            filtered_value = replace_nontext(six.text_type(value))
+            filtered_value = replace_nontext(str(value))
             element.setAttribute(key, filtered_value)
 
         if content: