drop python 2 support

Author: cjw296

.circleci/config.yml

@@ -39,15 +39,6 @@ jobs:
 
 common: &common
   jobs:
-    - sqlite:
-        name: python27-sqlite
-        python: '2.7'
-    - postgres:
-        name: python27-postgres
-        python: '2.7'
-    - mysql:
-        name: python27-mysql
-        python: '2.7'
     - sqlite:
         name: python37-sqlite
         python: '3.7'
@@ -61,9 +52,6 @@ common: &common
     - python/coverage:
         name: coverage
         requires:
-          - python27-sqlite
-          - python27-postgres
-          - python27-mysql
           - python37-sqlite
           - python37-postgres
           - python37-mysql

docs/conftest.py

@@ -3,12 +3,12 @@
 import textwrap
 from doctest import REPORT_NDIFF, ELLIPSIS
 from functools import partial
-from mortar_rdb.compat import StringIO
+from io import StringIO
 from os.path import join
 from unittest import TextTestRunner, makeSuite
 
 from sybil import Sybil, Region
-from sybil.parsers.doctest import DocTestParser, FIX_BYTE_UNICODE_REPR
+from sybil.parsers.doctest import DocTestParser
 from sybil.parsers.codeblock import CodeBlockParser
 from sybil.parsers.capture import parse_captures
 from testfixtures import compare, TempDirectory, Replacer, OutputCapture
@@ -104,7 +104,7 @@ def teardown(namespace):
 
 pytest_collect_file = Sybil(
     parsers=[
-        DocTestParser(optionflags=REPORT_NDIFF|ELLIPSIS|FIX_BYTE_UNICODE_REPR),
+        DocTestParser(optionflags=REPORT_NDIFF|ELLIPSIS),
         parse_captures,
         CodeBlockParser(['print_function']),
         FileParser('dir'),

mortar_rdb/compat.py

@@ -5,7 +5,6 @@
     compare, TempDirectory, ShouldRaise,
     StringComparison as S
     )
-from mortar_rdb.compat import PY2
 
 from mortar_rdb.controlled import Source, scan, Config
 from mortar_rdb.testing import TestingBase
@@ -42,16 +41,10 @@ def test_class(self):
         class SomethingElse:
             pass
 
-        if PY2:
-            text = (
-                "<class mortar_rdb.tests.test_controlled_schema."
-                "SomethingElse at [0-9a-zA-Z]+>"
-            )
-        else:
-            text = (
-                "<class 'mortar_rdb.tests.test_controlled_schema."
-                "TestSource.test_class.<locals>.SomethingElse'>"
-            )
+        text = (
+            "<class 'mortar_rdb.tests.test_controlled_schema."
+            "TestSource.test_class.<locals>.SomethingElse'>"
+        )
 
         with ShouldRaise(TypeError(S(
                     text+" must be a "
@@ -70,11 +63,7 @@ def tearDown(self):
         PackageTest.tearDown(self)
 
     def test_doesnt_exist(self):
-        if PY2:
-            exc = ImportError
-        else:
-            exc = ModuleNotFoundError
-        with ShouldRaise(exc):
+        with ShouldRaise(ModuleNotFoundError):
             scan('test.package.nothere')
 
     def test_module(self):

mortar_rdb/tests/test_controlled_schema.py

@@ -3,7 +3,6 @@
 from sqlalchemy.ext.declarative import DeclarativeMeta
 from testfixtures import Replacer, ShouldRaise
 from unittest import TestCase
-from mortar_rdb.compat import PY2
 
 
 class TestGetBase(TestCase):
@@ -29,10 +28,7 @@ def test_existing_base(self):
     def test_arguments(self):
         # the first parameter to declarative_base :-)
         engine = object()
-        if PY2:
-            text = 'declarative_base() takes exactly 0 arguments (1 given)'
-        else:
-            text = 'declarative_base() takes 0 positional arguments but 1 was given'
+        text = 'declarative_base() takes 0 positional arguments but 1 was given'
 
         with ShouldRaise(TypeError(text)):
             declarative_base(engine)

mortar_rdb/tests/test_declarative_base.py

@@ -1,17 +1,16 @@
+from unittest import TestCase
+
+from mock import Mock
 from sqlalchemy import create_engine
 from sqlalchemy.engine.url import make_url
+from testfixtures import (
+    Replacer, compare, ShouldRaise, LogCapture
+)
 from zope.sqlalchemy.datamanager import STATUS_CHANGED
 
 from mortar_rdb import register_session
-from mortar_rdb.compat import empty_str
 from mortar_rdb.interfaces import ISession
-from mock import Mock
-from sqlalchemy.orm.interfaces import SessionExtension
-from testfixtures import (
-    Replacer, Comparison as C, compare, ShouldRaise, LogCapture
-    )
-from unittest import TestCase
-from zope.sqlalchemy import ZopeTransactionExtension
+
 
 class TestUtility(TestCase):
 
@@ -244,7 +243,7 @@ def test_logging_normal(self):
         l.check((
                 'mortar_rdb',
                 'INFO',
-                "Registering session for sqlite:// with name "+empty_str
+                "Registering session for sqlite:// with name ''"
                 ))
 
     def test_logging_password(self):
@@ -257,7 +256,7 @@ def test_logging_password(self):
                 'mortar_rdb',
                 'INFO',
                 "Registering session for "
-                "mysql://user:***@localhost/db with name "+empty_str
+                "mysql://user:***@localhost/db with name ''"
                 ))
 
     def test_logging_username_password_db_same(self):
@@ -270,7 +269,7 @@ def test_logging_username_password_db_same(self):
                 'mortar_rdb',
                 'INFO',
                 "Registering session for "
-                "mysql://proj:***@localhost/proj with name "+empty_str
+                "mysql://proj:***@localhost/proj with name ''"
                 ))
 
     def test_logging_name(self):

mortar_rdb/tests/test_register_session.py

@@ -1,5 +1,4 @@
 from mortar_rdb import register_session, get_session
-from mortar_rdb.compat import empty_str
 from mortar_rdb.interfaces import ISession
 from testfixtures.components import TestComponents
 from sqlalchemy.exc import OperationalError
@@ -203,5 +202,5 @@ def test_logging_functional(self):
         l.check((
                 'mortar_rdb',
                 'INFO',
-                "Registering session for sqlite:// with name "+empty_str
+                "Registering session for sqlite:// with name ''"
                 ))

mortar_rdb/tests/test_utility.py

@@ -1,5 +1,2 @@
-[wheel]
-universal=1
-
 [tool:pytest]
 norecursedirs=_build

setup.cfg

@@ -19,12 +19,11 @@
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
     ],
+    python_requires='>=3.6',
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,