Fixed pydantic, string2json docstring

ICRAR · Mar 9, 2024 · 3bdf3bd · 3bdf3bd
1 parent 6f2a955
commit 3bdf3bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/daliuge-common/setup.py b/daliuge-common/setup.py
@@ -51,7 +51,7 @@ def do_versioning():
     "gputil>=1.4.0",
     "merklelib>=1.0",
     "pyzmq~=25.1.0",
-    "pydantic~=1.10.7",
+    "pydantic==1.10.7",
 ]
 
 setup(

diff --git a/daliuge-engine/dlg/apps/simple_functions.py b/daliuge-engine/dlg/apps/simple_functions.py
@@ -65,12 +65,13 @@ def createMultiOut(v1: Any = 1, v2: Any = 7) -> tuple:
     return out1, out2
 
 
-def string2json(string: str, pickle_flag=False) -> json:
+def string2json(string: str, pickle_flag: bool = False) -> list:
     """
     Simple function to convert a string to a JSON object
 
     Inputs:
         string: string containing a JSON representation
+        pickle_flag: False, whether output should be pickled
     """
     if not pickle_flag:
         return json.loads(string)

diff --git a/daliuge-translator/docker/Dockerfile.dev b/daliuge-translator/docker/Dockerfile.dev
@@ -19,7 +19,7 @@ RUN . /dlg/bin/activate && \
     pip3 install . 
 
 # Second stage build taking what's required from first stage
-FROM icrar/daliuge-common:${VCS_TAG}
+FROM icrar/daliuge-engine:${VCS_TAG}
 COPY --from=0 /daliuge/. /daliuge/.
 COPY --from=0 /dlg /dlg
 # RUN apt-get update && apt-get install -y libmetis-dev python3