Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates/alpha05c #310

Merged
merged 13 commits into from
Jan 6, 2025
22 changes: 11 additions & 11 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
path = cime
url = https://github.com/ESMCI/cime
fxDONOTUSEurl = https://github.com/ESMCI/cime
fxtag = cime6.1.46
fxtag = cime6.1.56
fxrequired = ToplevelRequired

[submodule "fms"]
Expand All @@ -51,29 +51,29 @@
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"]
path = components/clm
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_6_0_2
fxtag = cesm3_cice6_6_0_5

[submodule "mom"]
path = components/mom
Expand All @@ -86,22 +86,22 @@
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"]
path = components/cdeps
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
Expand All @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .lib/git-fleximod/git_fleximod/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .lib/git-fleximod/git_fleximod/git_fleximod.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion .lib/git-fleximod/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
maintainers = ["Jim Edwards <[email protected]>"]
Expand Down
2 changes: 1 addition & 1 deletion .lib/git-fleximod/tbump.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cime
2 changes: 1 addition & 1 deletion components/cice
Submodule cice updated 2 files
+1 −1 .gitmodules
+1 −1 src
Loading