rda-python-common 3.0.31__tar.gz → 3.0.32__tar.gz

{rda_python_common-3.0.31/src/rda_python_common.egg-info → rda_python_common-3.0.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.31
+Version: 3.0.32
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common
@@ -189,7 +189,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.31`).  If the import
+You should see the installed version (currently `3.0.32`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.31 → rda_python_common-3.0.32}/README.md

@@ -165,7 +165,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.31`).  If the import
+You should see the installed version (currently `3.0.32`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.31 → rda_python_common-3.0.32}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "3.0.31"
+version = "3.0.32"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_common-3.0.31 → rda_python_common-3.0.32}/src/rda_python_common/__init__.py

@@ -22,7 +22,7 @@ object that existing callers expect.
 
 from . import PgLOG, PgUtil, PgDBI, PgFile, PgLock, PgCMD, PgSIG, PgOPT, PgSplit
 
-__version__ = "3.0.31"
+__version__ = "3.0.32"
 
 __all__ = [
    "PgLOG",

{rda_python_common-3.0.31 → rda_python_common-3.0.32}/src/rda_python_common/pg_sig.py

@@ -487,7 +487,7 @@ class PgSIG(PgDBI):
         if not dumpon: self.set_dump(self.SDUMP['DEF'])
         if signum == signal.SIGQUIT: self.PGSIG['QUIT'] = 1
       if self.PGSIG['PPID'] <= 1 and len(self.CPIDS) > 0:  # passing signal to child processes
-         for pid in self.CPIDS: self.kill_process(pid, signum)
+         for pid in list(self.CPIDS): self.kill_process(pid, signum)   # SIGCHLD may change CPIDS
 
    # catch the termination signal so a batch run gets a chance to report before it dies
    # PBS kills a job that runs out of walltime with SIGTERM first and SIGKILL a few seconds
@@ -829,8 +829,8 @@ class PgSIG(PgDBI):
       Returns:
          int: The child PID, or 0 if not found.
       """
-      for cpid in self.CPIDS:
-         if self.CPIDS[cpid] == pname: return cpid
+      for cpid, cname in list(self.CPIDS.items()):   # a copy: SIGCHLD may remove entries meanwhile
+         if cname == pname: return cpid
       return 0
 
    # check one or all child processes if they are still running
@@ -870,15 +870,15 @@ class PgSIG(PgDBI):
                else:
                   self.pglog("{}: Child still running".format(pid), logact)
                pcnt = 1
-            elif pid in self.CPIDS:
-               del self.CPIDS[pid]   # clean the saved info for the process
+            else:
+               self.CPIDS.pop(pid, None)   # clean the saved info; SIGCHLD may have removed it
          elif not pname:
             cpids = list(self.CPIDS)
             for cpid in cpids:
                if self.check_process(cpid):  # process is not done yet
                   pcnt += 1
-               elif cpid in self.CPIDS:
-                  del self.CPIDS[cpid]
+               else:
+                  self.CPIDS.pop(cpid, None)
          if pcnt == 0 or dowait == 0 or pcnt < ccnt: break
          self.show_wait_message(i, "{}: wait {}/{} child processes".format(self.PGSIG['DSTR'], pcnt, self.PGSIG['MPROC']), logact, dowait)
          i += 1
@@ -1241,8 +1241,8 @@ class PgSIG(PgDBI):
       Returns:
          int: The background process ID, or 0 if not found.
       """
-      for cbid in self.CBIDS:
-         if self.CBIDS[cbid] == bcmd: return cbid
+      for cbid, ccmd in list(self.CBIDS.items()):   # a copy: SIGCHLD may remove entries meanwhile
+         if ccmd == bcmd: return cbid
       return 0
 
    # check one or all child processes if they are still running
@@ -1274,8 +1274,8 @@ class PgSIG(PgDBI):
                else:
                   self.pglog("{}: Background process still running".format(bid), logact)
                bcnt = 1
-            elif bid in self.CBIDS:
-               del self.CBIDS[bid]   # clean the saved info for the process
+            else:
+               self.CBIDS.pop(bid, None)   # clean the saved info; SIGCHLD may have removed it
          elif not bcmd:
             # Bug fix: cannot delete from a dict while iterating over it;
             # iterate over a copy of the keys instead.
@@ -1284,7 +1284,7 @@ class PgSIG(PgDBI):
                if self.check_process(cbid):  # process is not done yet
                   bcnt += 1
                else:
-                  if cbid in self.CBIDS: del self.CBIDS[cbid]   # SIGCHLD may have removed it
+                  self.CBIDS.pop(cbid, None)   # SIGCHLD may have removed it
          if not (bcnt and dowait): break
          self.show_wait_message(i, "{}: wait {}/{} background processes".format(self.PGSIG['DSTR'], bcnt, self.PGSIG['BPROC']), logact, dowait)
          i += 1

{rda_python_common-3.0.31 → rda_python_common-3.0.32/src/rda_python_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.31
+Version: 3.0.32
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common
@@ -189,7 +189,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.31`).  If the import
+You should see the installed version (currently `3.0.32`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.