Merge efdc868 into 3aab618

ICRAR · Oct 21, 2022 · c2bbc3f · c2bbc3f
2 parents 3aab618 + efdc868
commit c2bbc3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/daliuge-engine/setup.py b/daliuge-engine/setup.py
@@ -118,6 +118,7 @@ def run(self):
 install_requires = [
     "wheel",  # need to get wheel first...
     "bottle",
+    "boto3",
     "configobj",
     "crc32c",
     "daliuge-common==%s" % (VERSION,),
@@ -136,7 +137,7 @@ def run(self):
     "scp",
     "pyyaml",
     # 0.19.0 requires netifaces < 0.10.5, exactly the opposite of what *we* need
-    "zeroconf >= 0.19.1",
+    "zeroconf ~= 0.38.4",
     # 0.6 brings python3 support plus other fixes
     "zerorpc ~= 0.6.3",
 ]

diff --git a/daliuge-engine/test/manager/test_daemon.py b/daliuge-engine/test/manager/test_daemon.py
@@ -30,9 +30,10 @@
 from dlg.manager.client import MasterManagerClient
 from dlg.manager.proc_daemon import DlgDaemon
 
-_TIMEOUT = 10
+_TIMEOUT = 30
 IDENTITY = lambda x: x
 
+
 def wait_until(update_condition, test_condition=IDENTITY, timeout=_TIMEOUT, interval=0.1):
     timeout_time = time.time() + timeout
     while time.time() < timeout_time:
@@ -157,6 +158,7 @@ def _test_zeroconf_dim_mm(self, disable_zeroconf=False):
         if not disable_zeroconf:
             def _test_dims(dims):
                 return dims and dims["islands"]
+
             dims = _get_dims_from_client(mc, test_condition=_test_dims)
             self.assertIsNotNone(dims)
             return dims