Added tox support for Py3.6 testing

TACC · Feb 18, 2018 · fdd9cb3 · fdd9cb3
1 parent 25d1922
commit fdd9cb3
Show file tree

Hide file tree

Showing 6 changed files with 135 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ deps:
 	mkdir -p openapi
 
 clean:
-	rm -rf agavepy.egg-info build dist && \
+	rm -rf agavepy.egg-info build dist .cache && \
 	rm -rf schema openapi && \
 	cd docs && \
 	make clean

diff --git a/docs/_static/openapi/1.2/apis/actors.json b/docs/_static/openapi/1.2/apis/actors.json
@@ -236,6 +236,41 @@
             ], 
             "summary": "Send a message to an actor mailbox.", 
             "type": "ActorMessageRequestResponse"
+          }, 
+          {
+            "is_websocket": false, 
+            "method": "POST", 
+            "nickname": "sendBinaryMessage", 
+            "notes": "", 
+            "parameters": [
+              {
+                "allowMultiple": false, 
+                "description": "The id of the actor.", 
+                "name": "actorId", 
+                "paramType": "path", 
+                "required": true, 
+                "type": "string"
+              }, 
+              {
+                "allowMultiple": false, 
+                "description": "Optional dictionary of environmental variables", 
+                "name": "environment", 
+                "paramType": "query", 
+                "required": false, 
+                "type": "dict"
+              }, 
+              {
+                "allowMultiple": false, 
+                "defaultValue": "", 
+                "description": "The description of the message to add.", 
+                "name": "message", 
+                "paramType": "body", 
+                "required": true, 
+                "type": "MessageRequest"
+              }
+            ], 
+            "summary": "Send a message to an actor mailbox.", 
+            "type": "ActorMessageRequestResponse"
           }
         ], 
         "path": "/actors/v2/{actorId}/messages"
@@ -726,6 +761,49 @@
         ], 
         "path": "/actors/v2/{actorId}/executions/{executionId}"
       }, 
+      {
+        "description": "Get result for a specific execution.", 
+        "has_websocket": false, 
+        "operations": [
+          {
+            "is_websocket": false, 
+            "method": "GET", 
+            "nickname": "getOneExecutionResult", 
+            "notes": "", 
+            "parameters": [
+              {
+                "allowMultiple": false, 
+                "description": "The id of the actor.", 
+                "name": "actorId", 
+                "paramType": "path", 
+                "required": true, 
+                "type": "string"
+              }, 
+              {
+                "allowMultiple": false, 
+                "description": "The id of the execution.", 
+                "name": "executionId", 
+                "paramType": "path", 
+                "required": true, 
+                "type": "string"
+              }
+            ], 
+            "responseMessages": [
+              {
+                "code": 403, 
+                "message": "Failed to authenticate the user"
+              }, 
+              {
+                "code": 500, 
+                "message": "The service was unable to query the actor database"
+              }
+            ], 
+            "summary": "Get result for a specific actor execution.", 
+            "type": "string"
+          }
+        ], 
+        "path": "/actors/v2/{actorId}/executions/{executionId}/results"
+      }, 
       {
         "description": "Manage logs for a specific execution.", 
         "has_websocket": false, 

diff --git a/docs/agavepy.actors.rst b/docs/agavepy.actors.rst
@@ -378,6 +378,39 @@ Response:
       "type": "object"
     }
 
+sendBinaryMessage: Send a message to an actor mailbox.
+======================================================
+``agavepy.actors.sendBinaryMessage(actorId, message, environment=None)``
+
+Parameters:
+-----------
+    * **actorId**: The id of the actor. (string)
+    * **environment**: Optional dictionary of environmental variables (dict)
+    * **message**: The description of the message to add. (JSON, MessageRequest)
+
+
+**MessageRequest schema**
+
+.. code-block:: javascript
+
+    {
+      "$id": "http://agavepy.readthedocs.io/en/latest/MessageRequest.json", 
+      "$schema": "http://json-schema.org/draft-07/schema#", 
+      "properties": {
+        "message": {
+          "description": "The message to send to the actor.", 
+          "type": "string"
+        }
+      }, 
+      "required": [], 
+      "title": "AgavePy MessageRequest schema", 
+      "type": "object"
+    }
+
+Response:
+---------
+    * *A single ActorMessageResponse object*
+
 sendMessage: Send a message to an actor mailbox.
 ================================================
 ``agavepy.actors.sendMessage(actorId, body, environment=None)``
@@ -984,6 +1017,20 @@ Response:
       "type": "object"
     }
 
+getOneExecutionResult: Get result for a specific actor execution.
+=================================================================
+``agavepy.actors.getOneExecutionResult(actorId, executionId)``
+
+Parameters:
+-----------
+    * **actorId**: The id of the actor. (string)
+    * **executionId**: The id of the execution. (string)
+
+
+Response:
+---------
+    * *None*
+
 getExecutionLogs: Get logs for a specific actor execution.
 ==========================================================
 ``agavepy.actors.getExecutionLogs(actorId, executionId)``

diff --git a/requirements-py2.txt b/requirements-py2.txt
@@ -1 +1 @@
-wsgiref==0.1.2
+wsgiref>=0.1.2
diff --git a/requirements.txt b/requirements.txt
@@ -5,6 +5,6 @@ pytest>=2.7.0
 python-dateutil>=2.4.2
 requests>=2.6.0
 six>=1.9.0
-websocket-client==0.29.0
+websocket-client>=0.29.0
 requests_toolbelt>=0.7.1
 future>=0.16.0
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,7 @@
+[tox]
+envlist = py27,py36
+skipsdist = true
+
+[testenv]
+deps=pytest
+commands=py.test agavepy/tests/test_agave_basic.py