Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -124,42 +124,42 @@ fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
[submodule "mizuRoute"]
path = components/mizuRoute
url = https://github.com/ESCOMP/mizuRoute
fxtag = v3.0.0
fxtag = v3.0.1
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute

[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.63
fxtag = ccs_config_cesm1.0.65
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.1.135
fxtag = cime6.1.144
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.1.23
fxtag = cmeps1.1.24
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.83
fxtag = cdeps1.0.84
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxtag = share1.1.9
fxtag = share1.1.16
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share

Expand Down Expand Up @@ -194,6 +194,6 @@ fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
[submodule "tools/CUPiD"]
path = tools/CUPiD
url = https://github.com/NCAR/CUPiD.git
fxtag = v0.3.1
fxtag = v0.4.0
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
9 changes: 4 additions & 5 deletions .lib/git-fleximod/.github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ jobs:
- run: |
git config --global user.name "${GITHUB_ACTOR}"
git config --global user.email "${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com"
poetry run pytest
- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3

poetry run pytest --doctest-modules
# - name: Setup tmate session
# if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3
2 changes: 1 addition & 1 deletion .lib/git-fleximod/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ exclude: ^utils/.*$

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v6.0.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
Expand Down
6 changes: 3 additions & 3 deletions .lib/git-fleximod/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Examples of behaviors that contribute to a positive environment include:
* Communicate openly with respect for others, critiquing ideas rather than individuals and gracefully accepting criticism
* Acknowledging the contributions of others
* Avoid personal attacks directed toward other participants
* Be mindful of your surroundings and of your fellow participants
* Be mindful of your surroundings and of your fellow participants
* Alert UCAR staff and suppliers/vendors if you notice a dangerous situation or someone in distress
* Respect the rules and policies of the project and venue

Expand All @@ -29,7 +29,7 @@ Examples of unacceptable behavior include, but are not limited to:
* Personal attacks directed at other guests, members, participants, etc.
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Alarming, intimidating, threatening, or hostile comments or conduct
* Inappropriate use of nudity and/or sexual images
* Inappropriate use of nudity and/or sexual images
* Threatening or stalking anyone, including a participant
* Other conduct which could reasonably be considered inappropriate in a professional setting

Expand Down Expand Up @@ -60,7 +60,7 @@ the [Attribution](#attribution) section.
## Reporting
Instances of unacceptable behavior can be brought to the attention of the project administrator(s) who may take any action as
outlined in the [Consequences](#consequences) section below.
However, making a report to a project administrator is not considered an 'official report' to UCAR.
However, making a report to a project administrator is not considered an 'official report' to UCAR.

Instances of unacceptable behavior may also be reported directly to UCAR pursuant to [UCAR's Harassment Reporting and Complaint
Procedure](https://www2.fin.ucar.edu/procedures/hr/harassment-reporting-and-complaint-procedure), or anonymously through [UCAR's
Expand Down
35 changes: 29 additions & 6 deletions .lib/git-fleximod/git_fleximod/cli.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from pathlib import Path
import argparse, os, sys
from git_fleximod import utils

__version__ = "1.0.3"
__version__ = "1.1.1"


class CustomArgumentParser(argparse.ArgumentParser):
def print_help(self, file=None):
Expand All @@ -17,13 +17,28 @@ def print_help(self, file=None):
for path in candidate_paths:
if os.path.exists(path):
with open(path) as f:
print( f.read(), file=file)
print(f.read(), file=file)
return
print( "README.md not found.", file=file)
print("README.md not found.", file=file)


def find_root_dir(filename=".gitmodules"):
""" finds the highest directory in tree
which contains a file called filename """
"""
Finds the highest directory in tree which contains a file called filename.

>>> import tempfile, os
>>> cwd = os.getcwd()
>>> with tempfile.TemporaryDirectory() as tmp:
... subdir = Path(tmp) / 'subdir'
... subdir.mkdir()
... f = Path(tmp) / '.gitmodules'
... _ = f.write_text('')
... os.chdir(subdir)
... result = find_root_dir('.gitmodules') == str(tmp)
... os.chdir(cwd)
... result
True
"""
d = Path.cwd()
root = Path(d.root)
dirlist = []
Expand All @@ -40,6 +55,7 @@ def find_root_dir(filename=".gitmodules"):
return str(dl)
return None


def get_parser():
description = """
%(prog)s manages checking out groups of gitsubmodules with additional support for Earth System Models
Expand Down Expand Up @@ -116,6 +132,13 @@ def get_parser():
"verbosity level each time.",
)

parser.add_argument(
"--no-mods-details",
action="store_true",
default=False,
help="Suppress details on local mods in status output.",
)

parser.add_argument(
"-V",
"--version",
Expand Down
Loading