rda-python-common 1.0.49__tar.gz → 1.0.51__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of rda-python-common might be problematic. Click here for more details.

Files changed (21) hide show
  1. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/PKG-INFO +1 -1
  2. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/pyproject.toml +1 -1
  3. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/PgLOG.py +2 -2
  4. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/PgOPT.py +9 -2
  5. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common.egg-info/PKG-INFO +1 -1
  6. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/LICENSE +0 -0
  7. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/README.md +0 -0
  8. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/setup.cfg +0 -0
  9. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/PgCMD.py +0 -0
  10. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/PgDBI.py +0 -0
  11. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/PgFile.py +0 -0
  12. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/PgLock.py +0 -0
  13. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/PgSIG.py +0 -0
  14. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/PgSplit.py +0 -0
  15. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/PgUtil.py +0 -0
  16. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common/__init__.py +0 -0
  17. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common.egg-info/SOURCES.txt +0 -0
  18. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common.egg-info/dependency_links.txt +0 -0
  19. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common.egg-info/requires.txt +0 -0
  20. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/src/rda_python_common.egg-info/top_level.txt +0 -0
  21. {rda_python_common-1.0.49 → rda_python_common-1.0.51}/test/test_common.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_common
3
- Version: 1.0.49
3
+ Version: 1.0.51
4
4
  Summary: RDA Python common library codes shared by other RDA python packages
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-common
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "rda_python_common"
7
- version = "1.0.49"
7
+ version = "1.0.51"
8
8
  authors = [
9
9
  { name="Zaihua Ji", email="zji@ucar.edu" },
10
10
  ]
@@ -1349,12 +1349,12 @@ def set_common_pglog():
1349
1349
  SETPGLOG("DSSWEB", PGLOG['LOCDATA']+"/web")
1350
1350
  SETPGLOG("DSWHOME", PGLOG['DSSWEB']+"/datasets") # datast web root path
1351
1351
  PGLOG['HOMEROOTS'] = "{}|{}".format(PGLOG['DSSHOME'], PGLOG['DSWHOME'])
1352
- SETPGLOG("DSSDATA", "/glade/campaign/collections/gdex") # dss data root path
1352
+ SETPGLOG("DSSDATA", "/glade/campaign/collections/gdex") # dss data root path
1353
1353
  SETPGLOG("DSDHOME", PGLOG['DSSDATA']+"/data") # dataset data root path
1354
1354
  SETPGLOG("DECSHOME", PGLOG['DSSDATA']+"/decsdata") # dataset decsdata root path
1355
1355
  SETPGLOG("DSHHOME", PGLOG['DECSHOME']+"/helpfiles") # dataset help root path
1356
1356
  SETPGLOG("UPDTWKP", PGLOG['DSSDATA']+"/work") # dsupdt work root path
1357
- SETPGLOG("TRANSFER", PGLOG['DSSDATA']+"/transfer") # dss transfer partition
1357
+ SETPGLOG("TRANSFER", "/lustre/desc1/gdex/transfer") # dss transfer partition
1358
1358
  SETPGLOG("RQSTHOME", PGLOG['TRANSFER']+"/dsrqst") # dsrqst home
1359
1359
  SETPGLOG("DSAHOME", "") # dataset data alternate root path
1360
1360
  SETPGLOG("RQSTALTH", "") # alternate dsrqst path
@@ -1683,9 +1683,16 @@ def send_request_email_notice(pgrqst, errmsg, fcount, rstat, readyfile = None, p
1683
1683
 
1684
1684
  for ekey in einfo:
1685
1685
  if ekey == 'CCD' and not einfo['CCD']:
1686
- ebuf = re.sub(r'Cc:\s*<CCD>\s*', '', ebuf)
1686
+ mp = r'Cc:\s*<CCD>\s*'
1687
+ rep = ''
1687
1688
  else:
1688
- ebuf = re.sub(r'<{}>'.format(ekey), einfo[ekey], ebuf)
1689
+ mp = r'<{}>'.format(ekey)
1690
+ rep = einfo[ekey]
1691
+ if rep is None:
1692
+ PgLOG.pglog("{}.{}: None ekey value for reuqest email".format(pgrqst['rindex'], ekey),
1693
+ PGOPT['wrnlog']|PgLOG.FRCLOG)
1694
+ rep = ''
1695
+ ebuf = re.sub(mp, rep, ebuf)
1689
1696
 
1690
1697
  if PgLOG.PGLOG['DSCHECK'] and not pgpart:
1691
1698
  tbl = "dscheck"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_common
3
- Version: 1.0.49
3
+ Version: 1.0.51
4
4
  Summary: RDA Python common library codes shared by other RDA python packages
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-common