From b1568e72435702b3cfa0f35a733d09c1728c6d8b Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 13 Nov 2024 13:33:53 -0700 Subject: [PATCH 1/9] update poetry certifi version and update tests failing due to mpi-serial update --- poetry.lock | 6 +++--- tests/conftest.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3a74effcd..ac82fb0d9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -30,13 +30,13 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "certifi" -version = "2024.6.2" +version = "2024.8.30" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2024.6.2-py3-none-any.whl", hash = "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"}, - {file = "certifi-2024.6.2.tar.gz", hash = "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516"}, + {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"}, + {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"}, ] [[package]] diff --git a/tests/conftest.py b/tests/conftest.py index 81edbe713..1dd1b86f3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -32,7 +32,7 @@ def logger(): "submodule_name": "test_optional", "status1" : "test_optional MPIserial_2.5.0-3-gd82ce7c is out of sync with .gitmodules MPIserial_2.4.0", "status2" : "test_optional at tag MPIserial_2.4.0", - "status3" : "test_optional not checked out, out of sync at tag None, expected tag is MPIserial_2.4.0 (optional)", + "status3" : "test_optional not checked out, out of sync at tag MPIserial_2.5.1, expected tag is MPIserial_2.4.0 (optional)", "status4" : "test_optional at tag MPIserial_2.4.0", "gitmodules_content": """ [submodule "test_optional"] @@ -46,7 +46,7 @@ def logger(): "submodule_name": "test_alwaysoptional", "status1" : "test_alwaysoptional MPIserial_2.3.0 is out of sync with .gitmodules e5cf35c", "status2" : "test_alwaysoptional at hash e5cf35c", - "status3" : "out of sync at tag None, expected tag is e5cf35c", + "status3" : "out of sync at tag MPIserial_2.5.1, expected tag is e5cf35c", "status4" : "test_alwaysoptional at hash e5cf35c", "gitmodules_content": """ [submodule "test_alwaysoptional"] From e7f9a261ccde33f63bac2ba86073e8ac5954d33d Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 13 Nov 2024 14:06:10 -0700 Subject: [PATCH 2/9] fix issue 65 --- git_fleximod/cli.py | 36 ++++++++++++++++++++---------------- git_fleximod/git_fleximod.py | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/git_fleximod/cli.py b/git_fleximod/cli.py index 208bc0468..c0591d76e 100644 --- a/git_fleximod/cli.py +++ b/git_fleximod/cli.py @@ -7,22 +7,26 @@ def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree which contains a file called filename """ - d = Path.cwd() - root = Path(d.root) - dirlist = [] - dl = d - while dl != root: - dirlist.append(dl) - dl = dl.parent - dirlist.append(root) - dirlist.reverse() - - for dl in dirlist: - attempt = dl / filename - if attempt.is_file(): - return str(dl) - return None - + try: + root = utils.execute_subprocess(["git","rev-parse", "--show-toplevel"], + output_to_caller=True ).rstrip() + except: + d = Path.cwd() + root = Path(d.root) + dirlist = [] + dl = d + while dl != root: + dirlist.append(dl) + dl = dl.parent + dirlist.append(root) + dirlist.reverse() + + for dl in dirlist: + attempt = dl / filename + if attempt.is_file(): + return str(dl) + return None + return Path(root) def get_parser(): description = """ diff --git a/git_fleximod/git_fleximod.py b/git_fleximod/git_fleximod.py index 0851e9d09..13f35df95 100755 --- a/git_fleximod/git_fleximod.py +++ b/git_fleximod/git_fleximod.py @@ -342,7 +342,7 @@ def main(): excludelist=excludelist, ) if not gitmodules.sections(): - sys.exit("No submodule components found") + sys.exit(f"No submodule components found, root_dir={root_dir}") retval = 0 if action == "update": submodules_update(gitmodules, root_dir, fxrequired, force) From 135770709a5ea911427eda39b4fbb3c7f6ec9d95 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 13 Nov 2024 15:03:12 -0700 Subject: [PATCH 3/9] strip strip --- git_fleximod/submodule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_fleximod/submodule.py b/git_fleximod/submodule.py index c939d54bc..75d9dd4eb 100644 --- a/git_fleximod/submodule.py +++ b/git_fleximod/submodule.py @@ -221,7 +221,7 @@ def sparse_checkout(self): if superroot: gitroot = superroot.strip() else: - gitroot = self.root_dir.strip() + gitroot = self.root_dir # Now need to move the .git dir to the submodule location rootdotgit = os.path.join(self.root_dir, ".git") while os.path.isfile(rootdotgit): From 50bd54c63e38c52e0bfc4a1d6bc6cb0eea6cf645 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 13 Nov 2024 15:59:44 -0700 Subject: [PATCH 4/9] Bump to 0.9.3 --- git_fleximod/cli.py | 2 +- pyproject.toml | 2 +- tbump.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git_fleximod/cli.py b/git_fleximod/cli.py index c0591d76e..ac9493cfc 100644 --- a/git_fleximod/cli.py +++ b/git_fleximod/cli.py @@ -2,7 +2,7 @@ import argparse from git_fleximod import utils -__version__ = "0.9.2" +__version__ = "0.9.3" def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree diff --git a/pyproject.toml b/pyproject.toml index 619cdabe3..1d0419ad2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "git-fleximod" -version = "0.9.2" +version = "0.9.3" description = "Extended support for git-submodule and git-sparse-checkout" authors = ["Jim Edwards "] maintainers = ["Jim Edwards "] diff --git a/tbump.toml b/tbump.toml index 920ff0591..b432206a5 100644 --- a/tbump.toml +++ b/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/jedwards4b/git-fleximod/" [version] -current = "0.9.2" +current = "0.9.3" # Example of a semver regexp. # Make sure this matches current_version before From 004194fd4a3ba13ccdb1f14290112f8164074bcb Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 10:01:07 -0700 Subject: [PATCH 5/9] if not fxtag is available tag=hash --- git_fleximod/git_fleximod.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git_fleximod/git_fleximod.py b/git_fleximod/git_fleximod.py index 13f35df95..2c2601fa1 100755 --- a/git_fleximod/git_fleximod.py +++ b/git_fleximod/git_fleximod.py @@ -181,6 +181,8 @@ def init_submodule_from_gitmodules(gitmodules, name, root_dir, logger): url = gitmodules.get(name, "url") assert path and url, f"Malformed .gitmodules file {path} {url}" tag = gitmodules.get(name, "fxtag") + if not tag: + tag = gitmodules.get(name, "hash") fxurl = gitmodules.get(name, "fxDONOTUSEurl") fxsparse = gitmodules.get(name, "fxsparse") fxrequired = gitmodules.get(name, "fxrequired") @@ -250,7 +252,6 @@ def submodules_update(gitmodules, root_dir, requiredlist, force): newrequiredlist = ["AlwaysRequired"] if optional: newrequiredlist.append("AlwaysOptional") - submodules_update(gitsubmodules, repodir, newrequiredlist, force=force) def local_mods_output(): From 5f05c45c1f13cdb9e4a80efc2355882ac2ef1cf0 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 10:16:45 -0700 Subject: [PATCH 6/9] Bump to 0.9.4 --- git_fleximod/cli.py | 2 +- pyproject.toml | 2 +- tbump.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git_fleximod/cli.py b/git_fleximod/cli.py index ac9493cfc..131466b9b 100644 --- a/git_fleximod/cli.py +++ b/git_fleximod/cli.py @@ -2,7 +2,7 @@ import argparse from git_fleximod import utils -__version__ = "0.9.3" +__version__ = "0.9.4" def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree diff --git a/pyproject.toml b/pyproject.toml index 1d0419ad2..65924ff9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "git-fleximod" -version = "0.9.3" +version = "0.9.4" description = "Extended support for git-submodule and git-sparse-checkout" authors = ["Jim Edwards "] maintainers = ["Jim Edwards "] diff --git a/tbump.toml b/tbump.toml index b432206a5..be0b799d3 100644 --- a/tbump.toml +++ b/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/jedwards4b/git-fleximod/" [version] -current = "0.9.3" +current = "0.9.4" # Example of a semver regexp. # Make sure this matches current_version before From ae9a7e3d47f52bbd3ec33293f2436895ea8a2e0c Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Dec 2024 10:18:25 -0700 Subject: [PATCH 7/9] updates for alpha05c --- .gitmodules | 24 ++++++++++++------------ ccs_config | 2 +- cime | 2 +- components/cam | 2 +- components/cdeps | 2 +- components/cice | 2 +- components/cism | 2 +- components/clm | 2 +- components/cmeps | 2 +- components/mizuroute | 2 +- components/mosart | 2 +- components/rtm | 2 +- share | 2 +- tools/CUPiD | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitmodules b/.gitmodules index 370f42cef..5e3f9108f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,14 +30,14 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.12 + fxtag = ccs_config_cesm1.0.15 fxrequired = ToplevelRequired [submodule "cime"] path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.1.46 + fxtag = cime6.1.55 fxrequired = ToplevelRequired [submodule "fms"] @@ -51,14 +51,14 @@ path = share url = https://github.com/ESCOMP/CESM_share fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share - fxtag = share1.1.5 + fxtag = share1.1.7 fxrequired = ToplevelRequired [submodule "cam"] path = components/cam url = https://www.github.com/ESCOMP/CAM fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM - fxtag = cam6_4_047 + fxtag = cam6_4_048 fxrequired = ToplevelRequired [submodule "clm"] @@ -66,14 +66,14 @@ url = https://github.com/ESCOMP/CTSM fxDONOTUSEurl = https://github.com/ESCOMP/CTSM fxrequired = ToplevelRequired - fxtag = ctsm5.3.014 + fxtag = ctsm5.3.016 [submodule "cice"] path = components/cice url = https://github.com/ESCOMP/CESM_CICE fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE fxrequired = ToplevelRequired - fxtag = cesm3_cice6_5_0_14 + fxtag = cesm3_cice6_6_0_5 [submodule "mom"] path = components/mom @@ -86,7 +86,7 @@ path = components/cism url = https://github.com/ESCOMP/cism-wrapper.git fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git - fxtag = cismwrap_2_2_002 + fxtag = cismwrap_2_2_005 fxrequired = ToplevelRequired [submodule "cdeps"] @@ -94,14 +94,14 @@ url = https://github.com/ESCOMP/CDEPS fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS fxrequired = ToplevelRequired - fxtag = cdeps1.0.57 + fxtag = cdeps1.0.61 [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git fxrequired = ToplevelRequired - fxtag = cmeps1.0.25 + fxtag = cmeps1.0.33 [submodule "rtm"] path = components/rtm @@ -122,14 +122,14 @@ url = https://github.com/ESCOMP/mizuRoute fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute fxrequired = ToplevelRequired - fxtag = cesm-coupling.n02_v2.1.3 + fxtag = cesm-coupling.n03_v2.2.0 [submodule "mosart"] path = components/mosart url = https://github.com/ESCOMP/MOSART fxDONOTUSEurl = https://github.com/ESCOMP/MOSART fxrequired = ToplevelRequired - fxtag = mosart1.1.05 + fxtag = mosart1.1.06 [submodule "parallelio"] path = libraries/parallelio @@ -157,4 +157,4 @@ url = https://github.com/NCAR/CUPiD.git fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git fxrequired = ToplevelRequired - fxtag = v0.1.1 + fxtag = v0.1.2 diff --git a/ccs_config b/ccs_config index 1ebe59402..26aacc140 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 1ebe59402bc19881a6d711084e27bdbe6c69149c +Subproject commit 26aacc1403c01f44df4ab05d275c0fccd5ae3dce diff --git a/cime b/cime index 29aa60f99..85922c028 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 29aa60f999caa6c57f754ef123a4a235724777de +Subproject commit 85922c028ff8a5b9f5573888f4240cdc4b8104a3 diff --git a/components/cam b/components/cam index 47dd341f8..f429ebf6e 160000 --- a/components/cam +++ b/components/cam @@ -1 +1 @@ -Subproject commit 47dd341f83afc1e1faf28fd4cb6e463629db4c19 +Subproject commit f429ebf6eb615e0df8fab0efbc964629519195f1 diff --git a/components/cdeps b/components/cdeps index 4165d0657..0750c9175 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 4165d0657d6f60e8dba650e9a1771a1344972b76 +Subproject commit 0750c9175395d3ba3bf8eba65703dee230d08572 diff --git a/components/cice b/components/cice index eebe30a55..787d3ccf3 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit eebe30a55c114ac8456774e422f721d7504911e0 +Subproject commit 787d3ccf3b242214b0add3e474672f0609efcf2d diff --git a/components/cism b/components/cism index c84cc9f5b..41843ef8f 160000 --- a/components/cism +++ b/components/cism @@ -1 +1 @@ -Subproject commit c84cc9f5b3103766a35d0a7ddd5e9dbd7deae762 +Subproject commit 41843ef8fed91fcf60e2ea217c4f6f2ee5133c5d diff --git a/components/clm b/components/clm index 6d8dad82e..f437651ee 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 6d8dad82ed98a0e51e315d42991459386dc2da96 +Subproject commit f437651ee449789af9325882bb0acc09576c9411 diff --git a/components/cmeps b/components/cmeps index 959e9a0b1..4b636c6f7 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 959e9a0b1aa3c602de4674f0553875efa8f6c1b6 +Subproject commit 4b636c6f794ca02d854d15c620e26644751b449b diff --git a/components/mizuroute b/components/mizuroute index 2ff305a02..362bee329 160000 --- a/components/mizuroute +++ b/components/mizuroute @@ -1 +1 @@ -Subproject commit 2ff305a0292cb06789de6cfea7ad3cc0d6173493 +Subproject commit 362bee329bd6bf1fd45c8f36e006b9c4294bb8ca diff --git a/components/mosart b/components/mosart index e2ffe0000..a246344e9 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit e2ffe00004cc416cfc8bcfae2a949474075c1d1f +Subproject commit a246344e9b28e4bb42313749094fa20d45e2b212 diff --git a/components/rtm b/components/rtm index b3dfcfbba..a2cd8249e 160000 --- a/components/rtm +++ b/components/rtm @@ -1 +1 @@ -Subproject commit b3dfcfbba58c151ac5a6ab513b3515ef3deff798 +Subproject commit a2cd8249e40e8c61d68fe13145c4cf9d5e098f68 diff --git a/share b/share index 3dd7edb12..c5e7603c2 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit 3dd7edb12d3fc109914f922f3131711cf0d7fbd4 +Subproject commit c5e7603c29ea5e2fe93ca16d88bc9c7f16175bcd diff --git a/tools/CUPiD b/tools/CUPiD index 5cad93329..04ba5ebc2 160000 --- a/tools/CUPiD +++ b/tools/CUPiD @@ -1 +1 @@ -Subproject commit 5cad933293165959621ba282a42f3b54945415ea +Subproject commit 04ba5ebc21a0137785c17a63a6f9540195aa57af From 7c841e9cb6bc647cea1911543a2c3fbf65f7048b Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 30 Dec 2024 10:38:42 -0700 Subject: [PATCH 8/9] update cime with correction to leap year correction logic --- .gitmodules | 2 +- cime | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 03a35cf34..cfb27e0b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,7 +37,7 @@ path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.1.55 + fxtag = cime6.1.56 fxrequired = ToplevelRequired [submodule "fms"] diff --git a/cime b/cime index 85922c028..ac8e58310 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 85922c028ff8a5b9f5573888f4240cdc4b8104a3 +Subproject commit ac8e583108b1ce1f592a6f6436c71d6dc087f447 From b7515bb54d14783da086a567e763eb75cfb85db2 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 6 Jan 2025 11:36:47 -0700 Subject: [PATCH 9/9] update ccs_config and rtm --- .gitmodules | 4 ++-- ccs_config | 2 +- components/rtm | 2 +- components/ww3 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index cfb27e0b7..3584de532 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,7 +30,7 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.15 + fxtag = ccs_config_cesm1.0.16 fxrequired = ToplevelRequired [submodule "cime"] @@ -108,7 +108,7 @@ url = https://github.com/ESCOMP/RTM fxDONOTUSEurl = https://github.com/ESCOMP/RTM fxrequired = ToplevelRequired - fxtag = rtm1_0_83 + fxtag = rtm1_0_84 [submodule "ww3"] path = components/ww3 diff --git a/ccs_config b/ccs_config index 26aacc140..a712a9204 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 26aacc1403c01f44df4ab05d275c0fccd5ae3dce +Subproject commit a712a920453dc0cb2831dce576e78c389b567f7e diff --git a/components/rtm b/components/rtm index a2cd8249e..6899b5581 160000 --- a/components/rtm +++ b/components/rtm @@ -1 +1 @@ -Subproject commit a2cd8249e40e8c61d68fe13145c4cf9d5e098f68 +Subproject commit 6899b55816ee4d9b7cf983d74ba2997b97a13c4d diff --git a/components/ww3 b/components/ww3 index d16f7c8fd..fc5aa8434 160000 --- a/components/ww3 +++ b/components/ww3 @@ -1 +1 @@ -Subproject commit d16f7c8fdefb51385703f5821942a0c124812323 +Subproject commit fc5aa843472c36993ab479263f7c384bfc7ab4af