Merge pull request #18 from platinummonkey/issue-14

Drop support for python 2

Author: platinummonkey

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
-- '2.7'
-- '3.4'
+- '3.7'
 install:
 - pip install -r requirements.pip
 - pip install tox-travis

AUTHORS

@@ -1 +1 @@
-Cody Lee <[email protected]>
+Cody Lee <[email protected]>

Makefile

@@ -1,6 +1,27 @@
 .PHONY: clean-pyc ext-test test upload-docs docs coverage
 
-all: clean test coverage
+all: clean black test coverage
+
+black:
+	black -v -l 150 --include wiremock/*.py
+	black -v -l 150 --include wiremock/base/*.py
+	black -v -l 150 --include wiremock/exceptions/*.py
+	black -v -l 150 --include wiremock/resources/*.py
+	black -v -l 150 --include wiremock/resources/mappings/*.py
+	black -v -l 150 --include wiremock/resources/near_misses/*.py
+	black -v -l 150 --include wiremock/resources/requests/*.py
+	black -v -l 150 --include wiremock/resources/scenarios/*.py
+	black -v -l 150 --include wiremock/resources/settings/*.py
+	black -v -l 150 --include wiremock/server/*.py
+	black -v -l 150 --include wiremock/tests/*.py
+	black -v -l 150 --include wiremock/tests/base_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/mappings_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/near_misses_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/requests_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/scenarios_tests/*.py
+	black -v -l 150 --include wiremock/tests/resource_tests/settings_tests/*.py
+	black -v -l 150 --include wiremock/tests/server_tests/*.py
 
 test:
 	bash run_tests.sh

docs/changelog.rst

@@ -5,6 +5,11 @@ ChangeLog
 
 Changes to the library are recorded here.
 
+v2.0.0
+------
+  * Fixes issue #14
+  * Drops support for Python 2.x as this is EOL.
+
 v1.2.0
 ------
   * Add custom cert/verification options to be passed normally through the singleton config

docs/index.rst

@@ -13,7 +13,7 @@ Links
 * Official Repository: https://github.com/platinummonkey/python-wiremock.git
 * Package: TODO
 
-wiremock is known to support Python 2.7.
+wiremock is known to support Python 3.7.
 
 
 .. _download:

requirements.pip

@@ -1,15 +1,15 @@
-coverage~=4.3.4
-detox~=0.10.0
-docutils~=0.13.1
-mock~=2.0.0
-nose~=1.3.7
-python-coveralls~=2.9.0
-responses~=0.5.1
-requests~=2.13.0
-six>=1.10.0
-Sphinx~=1.5.3
-sphinx-rtd-theme~=0.2.4
-tox~=2.6.0
-virtualenv~=15.1.0
-watchdog~=0.8.3
-wheel>=0.24.0
+black==19.10b0
+coverage==5.0.3
+detox==0.19
+docutils==0.16
+mock==4.0.1
+nose==1.3.7
+python-coveralls==2.9.3
+requests==2.23.0
+responses==0.10.9
+Sphinx==2.4.3
+sphinx-rtd-theme==0.4.3
+toml==0.10.0
+tox==3.14.5
+virtualenv==20.0.5
+watchdog==0.10.2

setup.py

@@ -7,19 +7,19 @@
 
 version = open('wiremock/VERSION', 'r').readline().strip()
 develop_requires = [
-    'Sphinx~=1.5.3',
-    'coverage~=4.3.4',
-    'detox~=0.10.0',
-    'mock~=2.0.0',
+    'Sphinx~=2.4.3',
+    'black~=19.10b0',
+    'coverage~=5.0.3',
+    'detox~=0.19',
+    'mock~=4.0.1',
     'nose~=1.3.7',
-    'python-coveralls~=2.9.0',
-    'responses~=0.5.1',
-    'requests>=2.20.0',
-    'six>=1.10.0',
-    'sphinx-rtd-theme~=0.2.4',
-    'tox~=2.6.0',
-    'watchdog~=0.8.3',
-    'wheel>=0.24.0']
+    'python-coveralls~=2.9.3',
+    'responses~=0.10.9',
+    'requests~=2.23.0',
+    'sphinx-rtd-theme~=0.4.3',
+    'tox~=3.14.0',
+    'watchdog~=0.10.2',
+    'wheel>=0.34.2']
 
 long_desc = """
 wiremock is an API Client to the Admin API for WireMock Standalone installation: https://wiremock.org/docs
@@ -52,20 +52,19 @@
     ],
     keywords='wiremock',
     install_requires=[
-        'setuptools>=35.0.1',
-        'six>=1.10.0',
+        'setuptools>=45.2.0',
         'requests>=2.20.0'
     ],
     extras_require={
         'develop': develop_requires,
-        'docs': ['Sphinx>=1.5.3', 'sphinx-rtd-theme>=0.2.4', 'watchdog>=0.8.3'],
+        'docs': ['Sphinx>=2.4.3', 'sphinx-rtd-theme>=0.4.3', 'watchdog>=0.10.2'],
     },
     test_suite='nose.collector',
     tests_require=develop_requires,
     author='Cody Lee',
-    author_email='[email protected]',
+    author_email='[email protected]',
     maintainer='Cody Lee',
-    maintainer_email='[email protected]',
+    maintainer_email='[email protected]',
     url='https://github.com/platinummonkey/python-wiremock',
     license='Apache Software License 2.0',
     packages=find_packages(),

tox.ini

@@ -1,13 +1,13 @@
 [tox]
-envlist = py{27,34}
+envlist = py{37}
 
 [testenv]
 whitelist_externals =
     rm
 deps =
     nose
     coverage
-    setuptools>=35.0.1
+    setuptools>=45.2.0
     six
     mock
     responses

wiremock/VERSION

@@ -1 +1 @@
-1.2.0
+2.0.0

wiremock/_compat.py

@@ -1,35 +1,46 @@
-from __future__ import unicode_literals
-import six
-
-PY2 = six.PY2
-PY3 = six.PY3
-
-# conversions
-unichr = six.unichr
-if PY3:
-    long_ = int
-else:
-    long_ = long
-text_type = six.text_type
-string_types = six.string_types
-integer_types = six.integer_types
-bool_types = (bool, )
-binary_types = (six.binary_type, )
-float_types = (float, )
-array_types = (tuple, list)
-int_to_byte = six.int2byte
-
-# iterator functions
-iterkeys = six.iterkeys
-itervalues = six.itervalues
-iteritems = six.iteritems
-iterlists = six.iterlists
-iterbytes = six.iterbytes
-reraise = six.reraise
-
-with_metaclass = six.with_metaclass
-add_metaclass = six.add_metaclass
-print_ = six.print_
-urllib = six.moves.urllib
-
-get_method_self = six.get_method_self
+import sys
+import types
+
+
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(type):
+        def __new__(cls, name, this_bases, d):
+            if sys.version_info[:2] >= (3, 7):
+                # This version introduced PEP 560 that requires a bit
+                # of extra care (we mimic what is done by __build_class__).
+                resolved_bases = types.resolve_bases(bases)
+                if resolved_bases is not bases:
+                    d["__orig_bases__"] = bases
+            else:
+                resolved_bases = bases
+            return meta(name, resolved_bases, d)
+
+        @classmethod
+        def __prepare__(cls, name, this_bases):
+            return meta.__prepare__(name, bases)
+
+    return type.__new__(metaclass, "temporary_class", (), {})
+
+
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        slots = orig_vars.get("__slots__")
+        if slots is not None:
+            if isinstance(slots, str):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        orig_vars.pop("__dict__", None)
+        orig_vars.pop("__weakref__", None)
+        if hasattr(cls, "__qualname__"):
+            orig_vars["__qualname__"] = cls.__qualname__
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+
+    return wrapper