fix setup.py and requirements

update dependencies to modern versions

Author: platinummonkey

requirements.pip

@@ -1,15 +1,14 @@
-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
+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,18 @@
 
 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',
+    '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,13 +51,12 @@
     ],
     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,

wiremock/_compat.py

@@ -1,35 +1,44 @@
-from __future__ import unicode_literals
-import six
+import sys
+import types
 
-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
+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):
 
-# iterator functions
-iterkeys = six.iterkeys
-itervalues = six.itervalues
-iteritems = six.iteritems
-iterlists = six.iterlists
-iterbytes = six.iterbytes
-reraise = six.reraise
+        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)
 
-with_metaclass = six.with_metaclass
-add_metaclass = six.add_metaclass
-print_ = six.print_
-urllib = six.moves.urllib
+        @classmethod
+        def __prepare__(cls, name, this_bases):
+            return meta.__prepare__(name, bases)
+    return type.__new__(metaclass, 'temporary_class', (), {})
 
-get_method_self = six.get_method_self
+
+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

wiremock/base/base_entity.py

@@ -1,7 +1,7 @@
 from collections import OrderedDict
 import json
 
-from wiremock._compat import add_metaclass, array_types
+from wiremock._compat import add_metaclass
 
 
 class JsonPropertyValueContainer(object):
@@ -122,7 +122,7 @@ def __init__(self, **values):
         self._values = {}
         for name, prop in self._properties.items():
             value = values.get(prop.json_name, values.get(name, None))
-            if prop.is_list() and isinstance(value, array_types):  # This is a list with sub types
+            if prop.is_list() and isinstance(value, (tuple, list)):  # This is a list with sub types
                 l = prop.klass()
                 for v in value:
                     if prop.list_klass is not None and issubclass(prop.list_klass, BaseAbstractEntity):
@@ -191,7 +191,7 @@ def get_json_data(self):
             if item is not None:
                 if isinstance(item, BaseAbstractEntity):
                     item = item.get_json_data()
-                elif isinstance(item, array_types):
+                elif isinstance(item, (tuple, list)):
                     tmp = []
                     for i in item:
                         if isinstance(i, BaseAbstractEntity):
@@ -356,7 +356,7 @@ def get_json_data(self):
             if item is not None:
                 if isinstance(item, BaseAbstractEntity):
                     item = item.get_json_data()
-                elif item is not None and isinstance(item, array_types):
+                elif item is not None and isinstance(item, (tuple, list)):
                     tmp = []
                     for i in item:
                         if isinstance(i, BaseAbstractEntity):

wiremock/base/base_resource.py

@@ -2,7 +2,6 @@
 import requests
 from requests import exceptions as rexc
 
-from wiremock._compat import integer_types, float_types, array_types, string_types
 from wiremock.base.base_entity import BaseAbstractEntity
 from wiremock.constants import make_headers, Config, logger
 from wiremock.exceptions import *
@@ -194,9 +193,7 @@ def get_base_uri(cls, endpoint, **id_dict):
 
     @staticmethod
     def get_entity_id(entity_id, entityClass):
-        if not (isinstance(entity_id, integer_types) or isinstance(entity_id, string_types)
-                or isinstance(entity_id, entityClass)):
-
+        if not (isinstance(entity_id, (int, str)) or isinstance(entity_id, entityClass)):
             raise InvalidInputException(422, entity_id)
         if isinstance(entity_id, entityClass):
             entity_id = entity_id.id
@@ -285,7 +282,7 @@ def _retreive_all(cls, parameters=None, ids={}):  # pragma: no cover
             return response  # pragma: no cover
         else:
             response_json = response.json()
-            if isinstance(response_json, array_types):
+            if isinstance(response_json, (tuple, list)):
                 results = []
                 for r in response_json:
                     if isinstance(r, dict):
@@ -296,7 +293,7 @@ def _retreive_all(cls, parameters=None, ids={}):  # pragma: no cover
 
     @classmethod
     def _retreive_one(cls, entity, parameters=None, ids={}):  # pragma: no cover
-        if isinstance(entity, integer_types) or isinstance(entity, float_types):
+        if isinstance(entity, (int, float)):
             ids['id'] = entity
             response = cls.REST_CLIENT.get(
                 cls.get_base_uri(cls.endpoint_single(), **ids), headers=make_headers(), params=parameters
@@ -321,7 +318,7 @@ def _retreive_one(cls, entity, parameters=None, ids={}):  # pragma: no cover
 
     @classmethod
     def _delete(cls, entity, parameters=None, ids={}):  # pragma: no cover
-        if isinstance(entity, integer_types) or isinstance(entity, float_types):
+        if isinstance(entity, (int, float)):
             ids['id'] = entity
             response = cls.REST_CLIENT.delete(
                 cls.get_base_uri(cls.endpoint_single(), **ids), headers=make_headers(), params=parameters

wiremock/constants.py

@@ -3,7 +3,6 @@
 import logging
 
 from wiremock import __version__
-from wiremock._compat import *
 
 
 logger = logging.getLogger('wiremock')
@@ -47,12 +46,12 @@ def make_headers(**kwargs):
 
 
 def datetime_to_ms(dt):
-    if isinstance(dt, integer_types):
+    if isinstance(dt, int):
         return dt
     else:
         tmp = timegm(dt.utctimetuple())
         tmp += float(dt.microsecond) / 1000000.0
-        return long_(tmp * 1000.0)
+        return int(tmp * 1000.0)
 
 
 __all__ = ['Config', 'make_headers', 'logger', 'datetime_to_ms']

wiremock/server/server.py

@@ -7,8 +7,6 @@
 from pkg_resources import resource_filename
 from subprocess import Popen, PIPE, STDOUT
 
-from six import text_type
-
 from wiremock.server.exceptions import (
     WireMockServerAlreadyStartedError,
     WireMockServerNotStartedError
@@ -56,7 +54,7 @@ def start(self):
             raise WireMockServerNotStartedError("\n".join([
                 "returncode: {}".format(self.__subprocess.returncode),
                 "stdout:",
-                text_type(self.__subprocess.stdout.read())
+                self.__subprocess.stdout.read()
             ]))
 
         atexit.register(self.stop, raise_on_error=False)