Drop support for Python 2.7 (#109)

Author: vdel

Makefile

@@ -3,9 +3,8 @@ all: release
 build: clean
 	# lint + unit tests + build egg (available in host ./dist)
 	dmake test build-egg
-	# + test egg on python 2 and 3 using egg from host
-	dmake test -s test-egg-py2:2.7
-	dmake test -s test-egg-py3:3.6
+	# + test egg on python 3 using egg from host
+	dmake test -s test-egg-py3:3.8
 
 clean:
 	rm -rf dist

README.md

@@ -4,7 +4,7 @@
 
 This client have been made in order to help you integrating our services within your apps in python.
 
-Tested on python 2.7, 3.4, 3.5, 3.6.
+Tested on python 3.8, 3.9, 3.10, 3.11.
 
 # API Documentation
 

deepomatic/api/exceptions.py

@@ -26,35 +26,25 @@
 from tenacity import RetryError
 
 
-###############################################################################
-
 class DeepomaticException(Exception):
     def __init__(self, msg):
         super(DeepomaticException, self).__init__(msg)
 
-###############################################################################
-
 
 class CredentialsNotFound(DeepomaticException):
     pass
 
 
-###############################################################################
-
 class UnimplementedException(DeepomaticException):
     def __init__(self, msg):
         super(UnimplementedException, self).__init__(msg)
 
 
-###############################################################################
-
 class NoData(DeepomaticException):
     def __init__(self):
         super(NoData, self).__init__("No data !! You may need to call '.retrieve()' ?")
 
 
-###############################################################################
-
 class BadStatus(DeepomaticException):
     """
     Thrown when HTTP response status_code < 200 or status_code >= 300.
@@ -93,8 +83,6 @@ class ServerError(BadStatus):
     pass
 
 
-###############################################################################
-
 class TaskError(DeepomaticException):
     def __init__(self, task):
         self.task = task
@@ -106,8 +94,6 @@ def get_task_id(self):
         return self.task['id']
 
 
-###############################################################################
-
 class TaskTimeout(DeepomaticException):
     def __init__(self, task, retry_error=None):
         self.task = task
@@ -120,9 +106,6 @@ def get_task_id(self):
         return self.task['id']
 
 
-###############################################################################
-
-
 class HTTPRetryError(RetryError):
     pass
 

deepomatic/api/inference.py

@@ -5,7 +5,7 @@
 
 class InferenceResource(object):
     def inference(self, return_task=False, wait_task=True, **kwargs):
-        assert(self._pk is not None)
+        assert (self._pk is not None)
 
         inputs = kwargs.pop('inputs', None)
         if inputs is None:

deepomatic/api/inputs.py

@@ -32,7 +32,7 @@
 ###############################################################################
 
 def format_inputs(inputs, data):
-    assert(isinstance(inputs, list))
+    assert (isinstance(inputs, list))
 
     data = copy.deepcopy(data)
     files = {}

deepomatic/api/mixins.py

@@ -58,7 +58,7 @@ def __init__(self):
 
 class UpdatableResource(object):
     def update(self, replace=False, content_type='application/json', files=None, **kwargs):
-        assert(self._pk is not None)
+        assert (self._pk is not None)
 
         if self._helper.check_query_parameters:
             for arg_name in kwargs:
@@ -78,7 +78,7 @@ def update(self, replace=False, content_type='application/json', files=None, **k
 
 class DeletableResource(object):
     def delete(self):
-        assert(self._pk is not None)
+        assert (self._pk is not None)
         return self._helper.delete(self._uri(pk=self._pk))
 
 

deepomatic/api/resource.py

@@ -47,7 +47,7 @@ def retrieve(self, pk):
         return self.__class__(self._helper, pk=pk)
 
     def refresh(self):
-        assert(self._pk is not None)
+        assert (self._pk is not None)
         self._data = self._helper.get(self._uri(pk=self._pk))
         return self
 

deepomatic/api/resources/recognition.py

@@ -55,7 +55,7 @@ def get_base_uri(cls, pk, public=False, **kwargs):
         return '/recognition/public/' if public else '/recognition/specs/'
 
     def versions(self, offset=0, limit=100):
-        assert(self._pk is not None)
+        assert (self._pk is not None)
         return ResourceList(RecognitionVersion, self._helper, self._uri(pk=self._pk, suffix='versions'), offset, limit)
 
 

deepomatic/api/resources/task.py

@@ -77,7 +77,7 @@ def list(self, task_ids):
         """
         Returns a list of tasks
         """
-        assert(isinstance(task_ids, list))
+        assert (isinstance(task_ids, list))
         return super(Task, self).list(task_ids=task_ids)
 
     def wait(self, **retry_kwargs):

demo.py

@@ -343,11 +343,11 @@ def demo(client=None):
 
     # pending_tasks, error_tasks and success_tasks contains the original offset of the input parameter tasks
     for pos, pending in pending_tasks:
-        assert(tasks[pos].pk == pending.pk)
+        assert (tasks[pos].pk == pending.pk)
     for pos, err in error_tasks:
-        assert(tasks[pos].pk == err.pk)
+        assert (tasks[pos].pk == err.pk)
     for pos, success in success_tasks:
-        assert(tasks[pos].pk == success.pk)
+        assert (tasks[pos].pk == success.pk)
 
 ###########
 # Helpers #