rda-python-icoads 3.0.0__tar.gz → 3.0.2__tar.gz

{rda_python_icoads-3.0.0/src/rda_python_icoads.egg-info → rda_python_icoads-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_icoads
-Version: 3.0.0
+Version: 3.0.2
 Summary: RDA python package to manage RDA ICOADS datasets
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-icoads
@@ -11,6 +11,7 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
 Requires-Dist: rda_python_common>=3.0.14
 Requires-Dist: rda_python_dsrqst>=2.0.4
 Dynamic: license-file

{rda_python_icoads-3.0.0 → rda_python_icoads-3.0.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_icoads"
-version = "3.0.0"
+version = "3.0.2"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]
@@ -20,6 +20,7 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
 ]
 dependencies = [
+  "numpy",
   "rda_python_common>=3.0.14",
   "rda_python_dsrqst>=2.0.4",
 ]

{rda_python_icoads-3.0.0 → rda_python_icoads-3.0.2}/src/rda_python_icoads/fillitable.py

@@ -233,11 +233,15 @@ class FillItable(PgIMMA):
             else:
                self.pglog("{}({}): index counted already between {} and {}".format(var, val, pgrec['imin'], pgrec['imax']), self.LOGWRN)
 
-      cnt = 0
+      cnt = ncnt = 0
       for val in records:
          pgrec = records[val]
+         if not pgrec:
+            ncnt += 1   # counted already; nothing to add
+            continue
          cnt += self.pgupdt(vtable, pgrec, "{} = {}".format(var, val), self.LGEREX)
 
+      if ncnt: self.pglog("{}: nothing to add for {} values counted already".format(vtable, ncnt), self.LOGWRN)
       self.pglog("{} of {} values recounted in table '{}'".format(cnt, vcnt, vtable), self.LOGWRN)
 
    #

{rda_python_icoads-3.0.0 → rda_python_icoads-3.0.2}/src/rda_python_icoads/fillmonth.py

@@ -24,7 +24,7 @@ class FillMonth(PgUtil):
    def __init__(self):
       super().__init__()
       self.CMDS = {
-         'filename' : "IMMA1_R3.0.2_",
+         'filenames' : ["IMMA1_R3.0.2_", "IMMA1_R3.0.3_"],   # IMMA1_R3.0.3_ since 2025-08
          'fillicoads' : "fillicoads -i ",
          'fillitable' : "fillitable -t -v dck pt sid -r ",
          'cdmsmonth' : "cdmsmonth "
@@ -64,17 +64,31 @@ class FillMonth(PgUtil):
       self.cmdlog()
       sys.exit(0)
 
+   #
+   # locate the monthly IMMA1 file, gunzip it if only the gzipped one is on file
+   #
+   def get_monthly_file(self, smonth):
+
+      files = [fname + smonth for fname in self.CMDS['filenames']]
+
+      for file in files:
+         if op.isfile(file): return file
+
+      for file in files:
+         zfile = file + ".gz"
+         if op.isfile(zfile):
+            self.pgsystem("gunzip " + zfile, self.LGEREX, 5)
+            return file
+
+      self.pglog("Miss monthly IMMA1 file, gzipped or not, in {}: {}".format(
+                 op.abspath('.'), ', '.join(files)), self.LGEREX)
+
    #
    # fill monthly IMMA1 data to IVADDB
    #
    def fill_monthly_data(self, smonth, srange):
 
-      file = self.CMDS['filename'] + smonth
-
-      if not op.isfile(file):
-         # unzip file
-         cmd = "gunzip {}.gz".format(file)
-         self.pgsystem(cmd, self.LGWNEX, 5)
+      file = self.get_monthly_file(smonth)
 
       # fillicoads
       cmd = self.CMDS['fillicoads'] + file

{rda_python_icoads-3.0.0 → rda_python_icoads-3.0.2/src/rda_python_icoads.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_icoads
-Version: 3.0.0
+Version: 3.0.2
 Summary: RDA python package to manage RDA ICOADS datasets
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-icoads
@@ -11,6 +11,7 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
 Requires-Dist: rda_python_common>=3.0.14
 Requires-Dist: rda_python_dsrqst>=2.0.4
 Dynamic: license-file

{rda_python_icoads-3.0.0 → rda_python_icoads-3.0.2}/src/rda_python_icoads.egg-info/requires.txt

@@ -1,2 +1,3 @@
+numpy
 rda_python_common>=3.0.14
 rda_python_dsrqst>=2.0.4