portal 3.1.7__tar.gz → 3.1.9__tar.gz

{portal-3.1.7/portal.egg-info → portal-3.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.7
+Version: 3.1.9
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.1.7 → portal-3.1.9}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.1.7'
+__version__ = '3.1.9'
 
 import multiprocessing as mp
 try:

{portal-3.1.7 → portal-3.1.9}/portal/client.py

@@ -106,34 +106,19 @@ class Client:
     reqnum = bytes(data[:8])
     status = int.from_bytes(data[8:16], 'little', signed=False)
     future = self.futures.pop(reqnum, None)
-
-    assert future, (
-        f'Unexpected request number: {reqnum}',
-        sorted(self.futures.keys()))
-
-    if status == 0:
+    if not future:
+      existing = sorted(self.futures.keys())
+      print(f'Unexpected request number: {reqnum}', existing)
+    elif status == 0:
       data = packlib.unpack(data[16:])
       future.set_result(data)
+      with self.cond: self.cond.notify_all()
     else:
       message = bytes(data[16:]).decode('utf-8')
       self._seterr(future, RuntimeError(message))
-    with self.cond:
-      self.cond.notify_all()
+      with self.cond: self.cond.notify_all()
     self.socket.recv()
 
-    # if not future:
-    #   existing = sorted(self.futures.keys())
-    #   print(f'Unexpected request number: {reqnum}', existing)
-    # elif status == 0:
-    #   data = packlib.unpack(data[16:])
-    #   future.set_result(data)
-    #   with self.cond: self.cond.notify_all()
-    # else:
-    #   message = bytes(data[16:]).decode('utf-8')
-    #   self._seterr(future, RuntimeError(message))
-    #   with self.cond: self.cond.notify_all()
-    # self.socket.recv()
-
   def _disc(self):
     if self.socket.options.autoconn:
       for future in list(self.futures.values()):

{portal-3.1.7 → portal-3.1.9}/portal/contextlib.py

@@ -60,6 +60,7 @@ class Context:
         errfile = pathlib.Path(errfile)
       assert hasattr(errfile, 'exists') and hasattr(errfile, 'write_text')
       self.errfile = errfile
+      self._check_errfile()
 
     if interval:
       assert isinstance(interval, (int, float))
@@ -144,14 +145,14 @@ class Context:
     return self.children[ident]
 
   def _watcher(self):
-    while True:
-      if self.errfile and self.errfile.exists():
-        message = f'Shutting down due to error file: {self.errfile}',
-        print(message, file=sys.stderr)
-        self.shutdown(2)
-        break
-      if self.done.wait(self.interval):
-        break
+    while not self.done.wait(self.interval):
+      self._check_errfile()
+
+  def _check_errfile(self):
+    if self.errfile and self.errfile.exists():
+      message = f'Shutting down due to error file: {self.errfile}'
+      print(message, file=sys.stderr)
+      self.shutdown(exitcode=2)
 
 
 context = Context()

{portal-3.1.7 → portal-3.1.9/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.7
+Version: 3.1.9
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.1.7 → portal-3.1.9}/tests/test_errfile.py

@@ -24,31 +24,30 @@ class TestErrfile:
     assert 'line' in content
     assert 'in fn' in content
 
-  @pytest.mark.parametrize('repeat', range(3))
+  @pytest.mark.parametrize('repeat', range(5))
   def test_sibling_procs(self, tmpdir, repeat):
     errfile = pathlib.Path(tmpdir) / 'error'
-    ready = portal.context.mp.Semaphore(0)
+    barrier = portal.context.mp.Barrier(3)
 
-    def fn1(ready, errfile):
+    def fn1(barrier, errfile):
       portal.setup(errfile=errfile, interval=0.1)
-      ready.release()
+      barrier.wait()
       raise ValueError('reason')
 
-    def fn2(ready, errfile):
+    def fn2(barrier, errfile):
       portal.setup(errfile=errfile, interval=0.1)
-      ready.release()
+      barrier.wait()
       while True:
         time.sleep(0.1)
 
-    worker1 = portal.Process(fn1, ready, errfile, name='worker1', start=True)
-    worker2 = portal.Process(fn2, ready, errfile, name='worker2', start=True)
-    ready.acquire()
-    ready.acquire()
+    worker1 = portal.Process(fn1, barrier, errfile, start=True)
+    worker2 = portal.Process(fn2, barrier, errfile, start=True)
+    barrier.wait()
     worker1.join()
     worker2.join()
     content = errfile.read_text()
     first_line = content.split('\n')[0]
-    assert "Error in 'worker1' (ValueError: reason):" == first_line
+    assert "Error in 'fn1' (ValueError: reason):" == first_line
     assert not worker1.running
     assert not worker2.running
     assert worker1.exitcode == 1