rda-python-dsupdt 2.0.0__tar.gz → 2.0.2__tar.gz

{rda_python_dsupdt-2.0.0 → rda_python_dsupdt-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsupdt
-Version: 2.0.0
+Version: 2.0.2
 Summary: RDA Python Package to update RDA operational datasets
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsupdt

{rda_python_dsupdt-2.0.0 → rda_python_dsupdt-2.0.2}/pyproject.toml

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

{rda_python_dsupdt-2.0.0 → rda_python_dsupdt-2.0.2}/src/rda_python_dsupdt/dsupdt.py

@@ -18,8 +18,9 @@ import os
 import re
 from os import path as op
 from .pg_updt import PgUpdt
+from rda_python_common.pg_split import PgSplit
 
-class DsUpdt(PgUpdt):
+class DsUpdt(PgUpdt, PgSplit):
    def __init__(self):
       super().__init__()  # initialize parent class
       self.TEMPINFO = {}
@@ -34,8 +35,8 @@ class DsUpdt(PgUpdt):
          self.parsing_input(aname)
          self.check_enough_options(self.PGOPT['CACT'], self.PGOPT['ACTS'])
 
-   # start action of dsupdt
-   def start_action(self):
+   # start actions of dsupdt
+   def start_actions(self):
       if self.PGOPT['ACTS']&self.OPTS['CU'][0]:
          if 'CI' in self.params:
             if self.cache_update_control(self.params['CI'][0], 1):
@@ -1333,7 +1334,7 @@ class DsUpdt(PgUpdt):
       if tempinfo['gotnew'] and not re.search(r'(^|\s)-OE(\s|$)', options, re.I): acmd += " -OE"
       if 'VS' in self.params:
          acmd += " -VS {}".format(self.params['VS'])
-         if 'VS' in tempinfo: options = re.sub('-VS\s+\d+(\s+|$)', '', options, flags=re.I)
+         if 'VS' in tempinfo: options = re.sub(r'-VS\s+\d+(\s+|$)', '', options, flags=re.I)
       if tempinfo['RS'] == 1: acmd += " -RS"
       fnote = None
       if locrec['note'] and not re.search(r'(^|\s)-DE(\s|$)', options, re.I):
@@ -1705,7 +1706,7 @@ class DsUpdt(PgUpdt):
          return onote
       if pcnt == 2:   # replace start time
          if onote:   # get start time from existing note
-            replace = "{}{}{}".format(seps[0], patterns[0], seps[1])
+            replace = r"{}{}{}".format(seps[0], patterns[0], seps[1])
             ms = re.match(r'^(.*){}(.*){}'.format(replace, self.params['PD'][0]), note)
             if ms:
                init = ms.group(1)

{rda_python_dsupdt-2.0.0 → rda_python_dsupdt-2.0.2}/src/rda_python_dsupdt/pg_updt.py

@@ -1071,7 +1071,7 @@ class PgUpdt(PgOPT, PgCMD):
          ms = re.match(r'^(-\w+)', buf)
          while ms:
             flg = ms.group(1)
-            buf = re.sub('^-\w+\s+'.format(flg), '', buf, 1)   # remove options
+            buf = re.sub(r'^-\w+\s+'.format(flg), '', buf, 1)   # remove options
             if flg != "-r":   # no option value
                m = re.match(r'^(\S+)\s', buf)
                if not m: break

{rda_python_dsupdt-2.0.0 → rda_python_dsupdt-2.0.2}/src/rda_python_dsupdt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsupdt
-Version: 2.0.0
+Version: 2.0.2
 Summary: RDA Python Package to update RDA operational datasets
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsupdt