From a8c3e4316ee6e05e9ec8c439d49397df322693ac Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Mon, 18 Nov 2024 15:21:02 -0800 Subject: [PATCH 1/8] Update __init__.py --- pcmdi_metrics/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pcmdi_metrics/__init__.py b/pcmdi_metrics/__init__.py index 929dd8970..709d7973d 100644 --- a/pcmdi_metrics/__init__.py +++ b/pcmdi_metrics/__init__.py @@ -15,4 +15,5 @@ plog.addHandler(ch) plog.setLevel(LOG_LEVEL) from . import io -from ._version import __version__ +from .version import version +from .version import version as __version__ From eeebcd978702384f96ded08a494d94b0d9f9b2f2 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Mon, 18 Nov 2024 15:21:54 -0800 Subject: [PATCH 2/8] Update and rename _version.py to version.py --- pcmdi_metrics/_version.py | 1 - pcmdi_metrics/version.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 pcmdi_metrics/_version.py create mode 100644 pcmdi_metrics/version.py diff --git a/pcmdi_metrics/_version.py b/pcmdi_metrics/_version.py deleted file mode 100644 index 975f69142..000000000 --- a/pcmdi_metrics/_version.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "3.7.1" diff --git a/pcmdi_metrics/version.py b/pcmdi_metrics/version.py new file mode 100644 index 000000000..a4dfaa445 --- /dev/null +++ b/pcmdi_metrics/version.py @@ -0,0 +1 @@ +version = "3.7.1" From b1f3f87488895c9fae2c9095b9be443b90d4ad09 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Mon, 18 Nov 2024 15:22:50 -0800 Subject: [PATCH 3/8] Update setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index adf736b79..d707dba67 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,9 @@ # Read version from _version.py version = {} -with open("pcmdi_metrics/_version.py") as f: +with open("pcmdi_metrics/version.py") as f: exec(f.read(), version) - release_version = version["__version__"] + release_version = version["version"] p = subprocess.Popen( ("git", "describe", "--tags"), From 3ba6f726a15f1d7ec80aff18b85f78efcf927071 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Mon, 18 Nov 2024 15:26:22 -0800 Subject: [PATCH 4/8] Update and rename version.py to _version.py --- pcmdi_metrics/_version.py | 1 + pcmdi_metrics/version.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 pcmdi_metrics/_version.py delete mode 100644 pcmdi_metrics/version.py diff --git a/pcmdi_metrics/_version.py b/pcmdi_metrics/_version.py new file mode 100644 index 000000000..975f69142 --- /dev/null +++ b/pcmdi_metrics/_version.py @@ -0,0 +1 @@ +__version__ = "3.7.1" diff --git a/pcmdi_metrics/version.py b/pcmdi_metrics/version.py deleted file mode 100644 index a4dfaa445..000000000 --- a/pcmdi_metrics/version.py +++ /dev/null @@ -1 +0,0 @@ -version = "3.7.1" From 34b97ccf7709722bf27c707c2c09cbe7db1e0c1b Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Mon, 18 Nov 2024 15:26:49 -0800 Subject: [PATCH 5/8] Update __init__.py --- pcmdi_metrics/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcmdi_metrics/__init__.py b/pcmdi_metrics/__init__.py index 709d7973d..32ef5478c 100644 --- a/pcmdi_metrics/__init__.py +++ b/pcmdi_metrics/__init__.py @@ -15,5 +15,5 @@ plog.addHandler(ch) plog.setLevel(LOG_LEVEL) from . import io -from .version import version -from .version import version as __version__ +from ._version import __version__ +from ._version import __version__ as version From f7360013bf98b74d345b68a386aefd9fb7330b81 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Mon, 18 Nov 2024 15:29:09 -0800 Subject: [PATCH 6/8] Update base.py --- pcmdi_metrics/io/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcmdi_metrics/io/base.py b/pcmdi_metrics/io/base.py index 75f4d77c8..91d5c8e94 100755 --- a/pcmdi_metrics/io/base.py +++ b/pcmdi_metrics/io/base.py @@ -189,7 +189,7 @@ def generateProvenance(extra_pairs={}, history=True): } populate_prov(prov["openGL"]["GLX"]["client"], "glxinfo", pairs, sep=":", index=-1) - prov["packages"]["PMP"] = pcmdi_metrics.version.__git_tag_describe__ + prov["packages"]["PMP"] = pcmdi_metrics.version prov["packages"][ "PMPObs" ] = "See 'References' key below, for detailed obs provenance information." From d1a2c900803932d52e0d18093a9bb0b4648458b7 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Mon, 18 Nov 2024 15:30:52 -0800 Subject: [PATCH 7/8] Update setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index d707dba67..adf736b79 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,9 @@ # Read version from _version.py version = {} -with open("pcmdi_metrics/version.py") as f: +with open("pcmdi_metrics/_version.py") as f: exec(f.read(), version) - release_version = version["version"] + release_version = version["__version__"] p = subprocess.Popen( ("git", "describe", "--tags"), From 8643af78c90860cf1114a6905ceb0940c4d830ac Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Mon, 18 Nov 2024 15:32:26 -0800 Subject: [PATCH 8/8] Delete pcmdi_metrics/variability_mode/lib/version.py --- pcmdi_metrics/variability_mode/lib/version.py | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 pcmdi_metrics/variability_mode/lib/version.py diff --git a/pcmdi_metrics/variability_mode/lib/version.py b/pcmdi_metrics/variability_mode/lib/version.py deleted file mode 100644 index fd0433a26..000000000 --- a/pcmdi_metrics/variability_mode/lib/version.py +++ /dev/null @@ -1,3 +0,0 @@ -__version__ = "v0.1" -__git_tag_describe__ = "v0.1-131-g50e3a09" -__git_sha1__ = "50e3a099c94695d80df3249a986d81e1e137457a"