Merge pull request #35 from renanivo/drop-python-2

Drop python 2

.travis.yml

@@ -1,7 +1,6 @@
 dist: xenial
 language: python
 python:
-- 2.7
 - 3.5
 - 3.6
 - 3.7
@@ -15,11 +14,6 @@ env:
     - PYTEST="pytest>=4.0.0,<5.0.0"
     - PYTEST="pytest>=5.0.0,<6.0.0"
 
-matrix:
-  exclude:
-    - python: 2.7
-      env: PYTEST="pytest>=5.0.0,<6.0.0"
-
 cache:
   directories:
   - $HOME/.cache/pip

pytest_testdox/constants.py

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 TITLE_MARK = 'it'
 CLASS_NAME_MARK = 'describe'

pytest_testdox/formatters.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os
 import re
 
@@ -78,11 +75,11 @@ def _remove_patterns(statement, patterns):
         pattern = glob_pattern.replace('*', '')
 
         if glob_pattern.startswith('*'):
-            pattern = '{0}$'.format(pattern)
+            pattern = '{}$'.format(pattern)
             statement = re.sub(pattern, '', statement)
 
         elif glob_pattern.endswith('*'):
-            pattern = '^{0}'.format(pattern)
+            pattern = '^{}'.format(pattern)
             statement = re.sub(pattern, '', statement)
 
         elif '*' in glob_pattern:
@@ -92,7 +89,7 @@ def _remove_patterns(statement, patterns):
             statement = _remove_patterns(statement, infix_patterns)
 
         else:
-            pattern = '^{0}'.format(pattern)
+            pattern = '^{}'.format(pattern)
             statement = re.sub(pattern, '', statement)
 
     return statement

pytest_testdox/models.py

@@ -1,17 +1,11 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from collections import namedtuple
 
-import six
-
 from . import formatters
 
 PatternConfig = namedtuple('PatternConfig', 'files functions classes')
 
 
-@six.python_2_unicode_compatible
-class Node(object):
+class Node:
 
     def __init__(self, title, class_name, module_name):
         self.title = title
@@ -74,8 +68,7 @@ def parse(cls, nodeid, pattern_config, title=None, class_name=None):
         return cls(title=title, class_name=class_name, module_name=module_name)
 
 
-@six.python_2_unicode_compatible
-class Result(object):
+class Result:
 
     _OUTCOME_REPRESENTATION = {
         'passed': ' [x] ',
@@ -105,7 +98,7 @@ def __str__(self):
             outcome_representation=representation,
             node=formatters.pad_text_to_characters(
                 characters=representation,
-                text=six.text_type(self.node)
+                text=str(self.node)
             )
         )
 

pytest_testdox/plugin.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import sys
 
 import pytest
@@ -81,7 +78,7 @@ def pytest_runtest_makereport(item, call):
 class TestdoxTerminalReporter(TerminalReporter):
 
     def __init__(self, config, file=None):
-        TerminalReporter.__init__(self, config, file)
+        super().__init__(config, file)
         self._last_header = None
         self.pattern_config = models.PatternConfig(
             files=self.config.getini('python_files'),

pytest_testdox/wrappers.py

@@ -1,12 +1,7 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import six
-
 from . import formatters
 
 
-class Wrapper(object):
+class Wrapper:
 
     def __init__(self, wrapped):
         self.wrapped = wrapped
@@ -54,6 +49,6 @@ def __str__(self):
             outcome=outcome,
             node=formatters.pad_text_to_characters(
                 characters=outcome,
-                text=six.text_type(self.wrapped.node)
+                text=str(self.wrapped.node)
             )
         )

requirements-dev.txt

@@ -1,6 +1,5 @@
 bumpversion==0.5.3
 flake8==3.7.8
 isort==4.3.21
-mock==3.0.5
 pytest-cov==2.7.1
 pytest>=3.7.0

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 import os
 
 from setuptools import setup
@@ -22,26 +21,25 @@ def read(fname):
     keywords='pytest testdox test report bdd',
     install_requires=[
         'pytest>=3.7.0',
-        'six>=1.11.0',
     ],
     packages=['pytest_testdox'],
+    python_requires=">=3.5",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Framework :: Pytest',
         'Intended Audience :: Developers',
-        'Topic :: Software Development :: Testing',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
-        'Operating System :: OS Independent',
-        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python',
+        'Topic :: Software Development :: Testing',
     ],
     entry_points={
         'pytest11': [

tests/conftest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import os
 import warnings
 

tests/test_formatters.py

@@ -1,14 +1,11 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os
 
 import pytest
 
 from pytest_testdox import formatters
 
 
-class TestFormatTitle(object):
+class TestFormatTitle:
 
     @pytest.fixture
     def patterns(self):
@@ -26,7 +23,7 @@ def test_should_remove_test_pattern(self, patterns):
         )
 
 
-class TestFormatClassName(object):
+class TestFormatClassName:
 
     @pytest.fixture
     def patterns(self):
@@ -58,7 +55,7 @@ def test_should_not_split_letters_in_an_abbreviation(
         assert formatted == expected
 
 
-class TestFormatModuleName(object):
+class TestFormatModuleName:
 
     @pytest.fixture
     def patterns(self):
@@ -97,7 +94,7 @@ def test_should_remove_infix_glob_patterns(self):
         assert formatted == 'module'
 
 
-class TestFormatMultiLineText(object):
+class TestFormatMultiLineText:
 
     def test_should_strip_spaces_from_begin_and_end(self):
         assert formatters.format_multi_line_text('  works   ') == 'works'
@@ -112,7 +109,7 @@ def test_should_srip_spaces_from_multiple_lines(self):
         )
 
 
-class TestJustifyTextToCharacter(object):
+class TestJustifyTextToCharacter:
 
     def test_should_not_pad_single_line_text(self):
         assert formatters.pad_text_to_characters('>>>', 'some text') == (
@@ -141,7 +138,7 @@ def test_should_pad_the_following_lines_to_the_width_of_given_characters(
         )
 
 
-class TestIncludeParametrized(object):
+class TestIncludeParametrized:
 
     def test_should_return_title_when_no_parameters_are_found(self):
         assert formatters.include_parametrized(

tests/test_markers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pytest
 
 

tests/test_models.py

@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os
+from unittest import mock
 
-import mock
 import pytest
 
 from pytest_testdox import formatters
@@ -33,7 +30,7 @@ def pattern_config():
     )
 
 
-class TestNode(object):
+class TestNode:
 
     def test_parse_should_return_a_node_instance(self, pattern_config):
         nodeid = 'tests/test_module.py::test_title'
@@ -112,7 +109,7 @@ def test_should_not_be_equal_when_it_is_not_the_same_class(self, node):
         assert node != other
 
 
-class TestResult(object):
+class TestResult:
 
     @pytest.fixture
     def result(self, node):

tests/test_plugin.py

@@ -1,12 +1,9 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import pytest
 
 from pytest_testdox import constants
 
 
-class TestReport(object):
+class TestReport:
 
     @pytest.fixture
     def testdir(self, testdir):
@@ -79,11 +76,11 @@ def test_a_feature_is_working():
 
     def test_should_print_the_test_class_name(self, testdir):
         testdir.makepyfile("""
-            class TestFoo(object):
+            class TestFoo:
                 def test_foo(self):
                     pass
 
-            class TestBar(object):
+            class TestBar:
                 def test_bar(self):
                     pass
         """)
@@ -124,7 +121,7 @@ def test_should_use_python_patterns_configuration(self, testdir):
             python_functions=it*
         """)
         testdir.makefile('.py', module_spec="""
-            class DescribeTest(object):
+            class DescribeTest:
                 def it_runs(self):
                     pass
         """)
@@ -166,7 +163,7 @@ def test_should_override_class_names_with_class_name_mark(
                 My Class
                 My precious class
             ''')
-            class TestClass(object):
+            class TestClass:
 
                 def test_foo(self):
                     pass