Merge branch 'master' into feature/export-cwl

OpenAPI/tests/test_managers_openapi.sh

@@ -15,12 +15,14 @@ if [ $? -ne 0 ]; then
 	exit 0
 fi
 
+test -d editable_copies || mkdir editable_copies
 openapi_cli="docker run --rm -v ${PWD}/..:/local openapitools/openapi-generator-cli"
 for f in node_manager composite_manager translator; do
 	try $openapi_cli validate -i /local/$f.yaml
 	echo "{\"packageName\": \"${f}_client\"}" > config.properties
 	try $openapi_cli generate -i /local/$f.yaml -g python -o /local/tests/${f}_client -c /local/tests/config.properties
-	try pip install ./${f}_client
+	try cp -r ${f}_client editable_copies/${f}_client
+	try pip install editable_copies/${f}_client
 done
 rm config.properties
 
@@ -48,7 +50,7 @@ trap shutdown_dlg EXIT
 
 # Run the test client for managers only, which will perform a number of
 # operations in the servers, all of which should basically work
-sleep 1
+sleep 2
 try python managers_test_client.py
 
 # Now run the test client for the translator, which should culminate

docs/api/dlg.rst

@@ -41,6 +41,6 @@ dlg.graph_loader
 .. automodule:: dlg.graph_loader
    :members:
 
-dlg.delayed
-^^^^^^^^^^^
-.. autofunction:: dlg.delayed
+dlg.runtime.delayed
+^^^^^^^^^^^^^^^^^^^
+.. autofunction:: dlg.runtime.delayed

docs/conf.py

@@ -45,7 +45,8 @@ def __getattr__(cls, _):
         return MagicMock()
 
 MOCK_MODULES = ("boto3", "botocore", "bottle", "configobj", "crc32c", "dill",
-    "docker", "lockfile", "metis", "netifaces", "networkx", "paramiko", "psutil",
+    "docker", "lockfile", "metis", "netifaces", "networkx", "numpy",
+    "paramiko", "paramiko.client", "paramiko.rsakey", "psutil",
     "pyswarm", "python-daemon", "pyzmq", "scp", "zeroconf", "zerorpc")
 sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)