Merge pull request #6 from ohsu-comp-bio/python3-compat

all strings expected to be unicode

.travis.yml

@@ -6,7 +6,7 @@ python:
 install:
   - pip install pip --upgrade
   - pip install setuptools --upgrade
-  - pip install flake8 coverage nose coveralls
+  - pip install -r tests/requirements.txt
   - pip install -r requirements.txt
   - python setup.py install
 

requirements.txt

@@ -1,7 +1,4 @@
 attrs>=17.2.0
+future>=0.16.0
 polling>=0.3.0
-requests>=2.18.1
-setuptools>=36.0.1
-attr>=0.2.0
-requests_mock>=1.3.0
-PyYAML>=3.12
+requests>=2.18.2

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='py-tes',
-    version='0.1.3',
+    version='0.1.4',
     description='Library for communicating with the GA4GH Task Execution API',
     author='OHSU Computational Biology',
     author_email='CompBio@ohsu.edu',
@@ -13,12 +13,12 @@
     url="https://github.com/ohsu-comp-bio/py-tes",
     license='MIT',
     packages=find_packages(),
-    python_requires='>=2.6, <4',
+    python_requires='>=2.7, <4',
     install_requires=[
         "attrs>=17.2.0",
+        "future>=0.16.0",
         "polling>=0.3.0",
-        "requests>=2.18.1",
-        "PyYAML>=3.12"
+        "requests>=2.18.1"
     ],
     zip_safe=True,
     classifiers=[

tes/client.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, print_function, unicode_literals
 
 import polling
 import requests
@@ -7,7 +7,8 @@
 from attr.validators import instance_of
 from requests.utils import urlparse
 
-from tes.models import (Task, ListTasksRequest, ListTasksResponse, ServiceInfo)
+from tes.models import (Task, ListTasksRequest, ListTasksResponse, ServiceInfo,
+                        GetTaskRequest, CancelTaskRequest, CreateTaskResponse)
 from tes.utils import unmarshal, raise_for_status
 
 
@@ -44,21 +45,23 @@ def create_task(self, task):
             timeout=self.timeout
         )
         raise_for_status(response)
-        return str(response.json()["id"])
+        return unmarshal(response.json(), CreateTaskResponse).id
 
     def get_task(self, task_id, view="BASIC"):
-        payload = {"view": view}
+        req = GetTaskRequest(task_id, view)
+        payload = {"view": req.view}
         response = requests.get(
-            "%s/v1/tasks/%s" % (self.url, task_id),
+            "%s/v1/tasks/%s" % (self.url, req.id),
             params=payload,
             timeout=self.timeout
         )
         raise_for_status(response)
         return unmarshal(response.json(), Task)
 
     def cancel_task(self, task_id):
+        req = CancelTaskRequest(task_id)
         response = requests.post(
-            "%s/v1/tasks/%s:cancel" % (self.url, task_id),
+            "%s/v1/tasks/%s:cancel" % (self.url, req.id),
             timeout=self.timeout
         )
         raise_for_status(response)

tes/models.py

@@ -1,9 +1,10 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, print_function, unicode_literals
 
 import json
 
 from attr import asdict, attrs, attrib
 from attr.validators import instance_of, optional, in_
+from builtins import str
 
 
 @attrs

tes/utils.py

@@ -1,8 +1,7 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, print_function, unicode_literals
 
 import json
 import re
-import yaml
 
 from requests import HTTPError
 from tes.models import (Task, TaskParameter, Resources, Executor, Ports,
@@ -20,9 +19,9 @@ def camel_to_snake(name):
 
 def unmarshal(j, o, convert_camel_case=True):
     if isinstance(j, str):
-        m = yaml.safe_load(j)
+        m = json.loads(j)
     elif isinstance(j, dict):
-        m = yaml.safe_load(json.dumps(j))
+        m = j
     else:
         raise TypeError("j must be a str or dict")
 

tests/requirements.txt

@@ -0,0 +1,5 @@
+coverage>=4.4.1
+coveralls>=1.1
+flake8>=3.3.0
+nose>=1.3.7
+requests_mock>=1.3.0

tests/test_client.py

@@ -1,8 +1,11 @@
+from __future__ import unicode_literals
+
 import requests
 import requests_mock
 import unittest
 import uuid
 
+from builtins import str
 
 from tes.client import HTTPClient
 from tes.models import Task, Executor

tests/test_models.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import json
 import unittest
 
@@ -38,6 +40,8 @@ def test_is_valid(self):
 
         task3 = self.task
         task3.outputs = [
-            TaskParameter(url="s3:/some/path", path="foo", contents="content")
+            TaskParameter(
+                url="s3:/some/path", path="foo", contents="content"
+            )
         ]
         self.assertFalse(task3.is_valid()[0])

tests/test_utils.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import json
 import unittest