Merge pull request #1 from ecmwf-projects/develop

Release 0.7.0

Author: jameshawkes

polytope/api/RequestManager.py

@@ -329,10 +329,19 @@ def retrieve(
         if not inline_request:
             self._logger.info("Reading request file...")
             request = os.path.expanduser(request)
-            with open(request) as request_file_handler:
-                request = yaml.safe_load(request_file_handler)
+            # If we receive a file, pass it on as a string
+            with open(request, "r") as request_file_handler:
+                request = request_file_handler.read()
         else:
-            request = copy.deepcopy(request)
+            # If we receive a Python dictionary, encode it as yaml
+            # TODO: we don't know what the eventual data source requires,
+            # encoding to YAML is the most flexible approach for now, but
+            # this needs a more robust solution.
+            if isinstance(request, dict):
+                request = yaml.safe_dump(request)
+            # else try to convert plainly to string
+            else:
+                request = str(request)
         if not isinstance(request, list):
             user_requests = [request]
         else:

polytope/version.py

@@ -1 +1 @@
-__version__ = "0.6.3"
+__version__ = "0.7.0"

tests/unit/test_polytope_client.py

@@ -47,7 +47,6 @@ def test_session_config():
 
 
 def test_session_config_port_in_address():
-
     a = "aaa.com:123"
     p = 200
     c = Client(address=a, port=p, config_path=ValueStorage.config_path)
@@ -56,7 +55,6 @@ def test_session_config_port_in_address():
 
 
 def test_session_config_http():
-
     a = "https://aaa.com"
     c = Client(address=a, config_path=ValueStorage.config_path)
     url = c.config.get_url("api_root")
@@ -66,7 +64,6 @@ def test_session_config_http():
 
 
 def test_session_config_address_path():
-
     a = "aaa.com:32/abc"
     c = Client(address=a, config_path=ValueStorage.config_path)
     url = c.config.get_url("api_root")
@@ -76,23 +73,20 @@ def test_session_config_address_path():
 
 
 def test_session_config_address_path_with_port():
-
     a = "aaa.com/abc"
     c = Client(address=a, port=32, config_path=ValueStorage.config_path)
     url = c.config.get_url("api_root")
     assert url.startswith("https://aaa.com:32/abc")
 
 
 def test_session_config_invalid_scheme():
-
     a = "ftp://aaa.com/abc"
     c = Client(address=a, config_path=ValueStorage.config_path)
     with pytest.raises(ValueError):
         c.config.get_url("api_root")
 
 
 def test_session_config_invalid_host():
-
     a = "ftp:aaa.com/abc"
     c = Client(address=a, config_path=ValueStorage.config_path)
     with pytest.raises(ValueError):