rda-python-dsarch 1.0.29__tar.gz → 1.0.31__tar.gz

{rda_python_dsarch-1.0.29 → rda_python_dsarch-1.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 1.0.29
+Version: 1.0.31
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch

{rda_python_dsarch-1.0.29 → rda_python_dsarch-1.0.31}/pyproject.toml

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

{rda_python_dsarch-1.0.29 → rda_python_dsarch-1.0.31}/src/rda_python_dsarch/PgArch.py

@@ -719,10 +719,10 @@ def set_qsub_walltime():
       return
 
    if 'GX' in PgOPT.params:
-      fcnt *= 100
+      fcnt *= 300
    elif 'DX' in PgOPT.params:
       fcnt *= 10
-   hr = int(fcnt/30000)
+   hr = int(fcnt/30000) + 1
    if hr == 6: return
 
    if hr < 2:

{rda_python_dsarch-1.0.29 → rda_python_dsarch-1.0.31}/src/rda_python_dsarch/dsarch.py

@@ -2447,7 +2447,7 @@ def set_group_info():
          level = 1
          pindex = record['pindex'] if 'pindex' in record and record['pindex'] else 0
          if pindex:
-            if abs(pindex) >= abs(gindex):
+            if abs(pindex) >= abs(int(gindex)):
                PgLOG.pglog("{}-{}: Parent Group Index {} must be smaller than current Index!".format(dsid, gindex, pindex), PgLOG.LGEREX)
             prec = PgDBI.pgget(tname, 'grptype', "{} AND gindex = {}".format(dcnd, pindex), PgLOG.LGEREX)
             if not prec:

{rda_python_dsarch-1.0.29 → rda_python_dsarch-1.0.31}/src/rda_python_dsarch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 1.0.29
+Version: 1.0.31
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch