rda-python-common 3.0.5__tar.gz → 3.0.7__tar.gz

{rda_python_common-3.0.5/src/rda_python_common.egg-info → rda_python_common-3.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.5
+Version: 3.0.7
 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

{rda_python_common-3.0.5 → rda_python_common-3.0.7}/pyproject.toml

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

{rda_python_common-3.0.5 → rda_python_common-3.0.7}/src/rda_python_common/pg_log.py

@@ -124,7 +124,8 @@ class PgLOG:
          'SETUID': '',         # the login name for suid if it is different to the CURUID
          'FILEMODE': 0o664,    # default 8-base file mode
          'EXECMODE': 0o775,    # default 8-base executable file mode or directory mode
-         # COMMONUSER and ADMINUSER are set below via SETPGLOG (env overrides PG<KEY>)
+         # COMMONUSER and ADMINUSER are set in set_common_pglog() via SETPGLOG,
+         # which lets environment variables COMMONUSER/ADMINUSER override the defaults
          'SUDOGDEX': 0,         # 1 to allow sudo to self.PGLOG['COMMONUSER']
          'HOSTNAME': '',        # current host name the process in running on
          'OBJCTSTR': "object",
@@ -183,13 +184,6 @@ class PgLOG:
       self.set_common_pglog()
       self.OUTPUT = None
 
-   def SETPGLOG(self, key, default):
-      """Set ``self.PGLOG[key]`` from environment variable ``PG<key>`` or
-      fall back to ``default`` if the variable is unset.  Used to make
-      per-environment overrides (e.g. PGCOMMONUSER, PGADMINUSER) survive
-      package upgrades."""
-      self.PGLOG[key] = os.environ.get('PG' + key, default)
-
    def open_output(self, outfile=None):
       """Open the result output destination.
 
@@ -1435,7 +1429,7 @@ class PgLOG:
 
       Called automatically by :meth:`__init__`.
       """
-      # resolve common/admin user from environment (PGCOMMONUSER / PGADMINUSER)
+      # resolve common/admin user from environment (COMMONUSER / ADMINUSER)
       self.SETPGLOG("COMMONUSER", "gdexdata")
       self.SETPGLOG("ADMINUSER", "zji")
       self.PGLOG['RDAUSER'] = self.PGLOG['COMMONUSER']
@@ -1510,7 +1504,7 @@ class PgLOG:
       sm = "/usr/sbin/sendmail"
       if self.valid_command(sm): self.SETPGLOG("EMLSEND", f"{sm} -t")   # send email command
       self.SETPGLOG("DBGLEVEL", '')                             # debug level
-      self.SETPGLOG("BAOTOKEN", 's.lh2t2kDjrqs3V8y2BU2zOocT')   # OpenBao token
+      self.SETPGLOG("BAOTOKEN", 's.MdOPGayn0HcuuSPrmMqCvzJA')   # OpenBao token
       self.SETPGLOG("DBGPATH", self.PGLOG['DSSDBHM']+"/log")    # path to debug log file
       self.SETPGLOG("OBJCTBKT", "gdex-data")                    # default Bucket on Object Store
       self.SETPGLOG("BACKUPEP", "gdex-quasar")                  # default Globus Endpoint on Quasar

{rda_python_common-3.0.5 → rda_python_common-3.0.7/src/rda_python_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.5
+Version: 3.0.7
 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