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

cam6_4_011: Update submodules, git-fleximod; fix fv3 build; remove mct reference #1089

Merged
merged 49 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
2ede182
add optional to status output
jedwards4b Jun 8, 2024
7ea36dc
remove manage_externals error
jedwards4b Jun 10, 2024
af12c80
fix spelling
jedwards4b Jun 11, 2024
34daa06
Merge pull request #46 from ESMCI/add_optional_keyword
jedwards4b Jun 12, 2024
8eae7e3
Bump to 0.7.8
jedwards4b Jun 12, 2024
0c3d683
dependabot changes and issue #48
jedwards4b Jun 26, 2024
46043f0
add code of conduct (issue #35)
jedwards4b Jun 26, 2024
31ce71b
use poetry update to update poetry.lock file
jedwards4b Jun 26, 2024
1f07cb6
Merge pull request #49 from ESMCI/fix/fxDONOTUSEurl
jedwards4b Jun 26, 2024
5322019
Bump to 0.7.9
jedwards4b Jun 26, 2024
1991e3d
fix the path to fms for fv3 build, remove mct reference
jedwards4b Jun 27, 2024
a7d8b4e
all pytests passing
jedwards4b Jul 1, 2024
82dd7a4
test_b_update now working
jedwards4b Jul 4, 2024
72211d2
add the new submodule class
jedwards4b Jul 4, 2024
2b021fd
add documentation to submodule.py
jedwards4b Jul 4, 2024
143abac
tests a-d all pass
jedwards4b Jul 4, 2024
62a338b
all pytests now passing
jedwards4b Jul 4, 2024
ded91fd
all tests passing, issue #50 fixed
jedwards4b Jul 4, 2024
dae1c82
now working with issue #50
jedwards4b Jul 4, 2024
53fce57
no need to make submodule objects persist
jedwards4b Jul 4, 2024
6ccf617
Merge pull request #51 from ESMCI/fix/recursive
jedwards4b Jul 5, 2024
c624b61
Bump to 0.8.0
jedwards4b Jul 5, 2024
49fdf80
Merge commit 'c624b61124d911f52ca8eead618ed2dd3c1b2171' into git_flex…
jedwards4b Jul 5, 2024
90997f2
Merge remote-tracking branch 'JE/fix/fms_path' into rm-mct
brian-eaton Jul 8, 2024
f1c87ad
update .gitmodules
brian-eaton Jul 8, 2024
4bfbee8
update to share1.1.2
brian-eaton Jul 8, 2024
02ea7e5
update to cmeps1.0.0
brian-eaton Jul 8, 2024
e9cd2be
better fix for issue with ssh access
jedwards4b Jul 8, 2024
229ba03
Merge pull request #53 from ESMCI/fix/ssh_access
jedwards4b Jul 8, 2024
faecf48
Merge commit '229ba03c7bae80ffdc5b3084372f4832308cad42' into git_flex…
jedwards4b Jul 8, 2024
9acbc02
submodule diffs
brian-eaton Jul 8, 2024
a6e43fc
Bump to 0.8.1
jedwards4b Jul 8, 2024
639805f
Merge commit 'a6e43fcfd70795763c0fed13d3b0d8ae9151dcc7' into git_flex…
jedwards4b Jul 8, 2024
a90de4f
update to fetch tag first
jedwards4b Jul 9, 2024
7136066
Merge pull request #54 from ESMCI/fix/tag-not-found
jedwards4b Jul 9, 2024
75a0337
Bump to 0.8.2
jedwards4b Jul 9, 2024
bdbe172
Merge commit '75a03373577f5ed19a00d2c387ca36bff1172d76' into git_flex…
jedwards4b Jul 9, 2024
9b231d8
Merge remote-tracking branch 'JE/git_fleximod_update0.8.0' into rm-mct
brian-eaton Jul 12, 2024
504033f
Merge branch 'cam_development' of https://github.com/ESCOMP/CAM into …
brian-eaton Jul 12, 2024
b915d40
update submodules to cesm3_0_alpha02a
brian-eaton Jul 12, 2024
4f7adf3
update submodule directories
brian-eaton Jul 12, 2024
e9e7304
Merge branch 'rm-mct' of https://github.com/brian-eaton/CAM into rm-mct
brian-eaton Jul 12, 2024
5c748de
start ChangeLog entry
brian-eaton Jul 12, 2024
42aad5e
update ChangeLog
brian-eaton Jul 15, 2024
da47c9c
Change CAM7 runs to use CLM60
cacraigucar Jul 18, 2024
12fca51
Merge tag 'cam6_4_010' into rm-mct
cacraigucar Jul 18, 2024
8c94dae
Add FHIST_BDRD test to prealpha
cacraigucar Jul 18, 2024
eee17cd
Revert back testlist
cacraigucar Jul 18, 2024
f5806ea
ChangeLog for cam6_4_011
cacraigucar Jul 18, 2024
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
27 changes: 10 additions & 17 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -102,73 +102,66 @@
[submodule "cism"]
path = components/cism
url = https://github.com/ESCOMP/CISM-wrapper
fxtag = cismwrap_2_2_001
fxtag = cismwrap_2_2_002
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper

[submodule "rtm"]
path = components/rtm
url = https://github.com/ESCOMP/RTM
fxtag = rtm1_0_79
fxtag = rtm1_0_80
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/RTM

[submodule "mosart"]
path = components/mosart
url = https://github.com/ESCOMP/MOSART
fxtag = mosart1_0_49
fxtag = mosart1.1.02
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART

[submodule "mizuRoute"]
path = components/mizuRoute
url = https://github.com/ESCOMP/mizuRoute
fxtag = cesm-coupling.n02_v2.1.2
fxtag = cesm-coupling.n02_v2.1.3
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_cesm0.0.106
fxtag = ccs_config_cesm1.0.0
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

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

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

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

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

[submodule "mct"]
path = libraries/mct
url = https://github.com/MCSclimate/MCT
fxtag = MCT_2.11.0
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/MCSclimate/MCT

[submodule "parallelio"]
path = libraries/parallelio
url = https://github.com/NCAR/ParallelIO
Expand All @@ -186,7 +179,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
[submodule "clm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM
fxtag = ctsm5.2.007
fxtag = ctsm5.2.009
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM

Expand Down
107 changes: 107 additions & 0 deletions .lib/git-fleximod/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
# Contributor Code of Conduct
_The Contributor Code of Conduct is for participants in our software projects and community._

## Our Pledge
We, as contributors, creators, stewards, and maintainers (participants), of **git-fleximod** pledge to make participation in
our software, system or hardware project and community a safe, productive, welcoming and inclusive experience for everyone.
All participants are required to abide by this Code of Conduct.
This includes respectful treatment of everyone regardless of age, body size, disability, ethnicity, gender identity or expression,
level of experience, nationality, political affiliation, veteran status, pregnancy, genetic information, physical appearance, race,
religion, or sexual orientation, as well as any other characteristic protected under applicable US federal or state law.

## Our Standards
Examples of behaviors that contribute to a positive environment include:

* All participants are treated with respect and consideration, valuing a diversity of views and opinions
* Be considerate, respectful, and collaborative
* 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
* 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

Examples of unacceptable behavior include, but are not limited to:

* Harassment, intimidation, or discrimination in any form
* Physical, verbal, or written abuse by anyone to anyone, including repeated use of pronouns other than those requested
* Unwelcome sexual attention or advances
* 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
* Threatening or stalking anyone, including a participant
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Scope
This Code of Conduct applies to all spaces managed by the Project whether they be physical, online or face-to-face.
This includes project code, code repository, associated web pages, documentation, mailing lists, project websites and wiki pages,
issue tracker, meetings, telecons, events, project social media accounts, and any other forums created by the project team which the
community uses for communication.
In addition, violations of this Code of Conduct outside these spaces may affect a person's ability to participate within them.
Representation of a project may be further defined and clarified by project maintainers.

## Community Responsibilities
Everyone in the community is empowered to respond to people who are showing unacceptable behavior.
They can talk to them privately or publicly.
Anyone requested to stop unacceptable behavior is expected to comply immediately.
If the behavior continues concerns may be brought to the project administrators or to any other party listed in the
[Reporting](#reporting) section below.

## Project Administrator Responsibilities
Project administrators are responsible for clarifying the standards of acceptable behavior and are encouraged to model appropriate
behavior and provide support when people in the community point out inappropriate behavior.
Project administrator(s) are normally the ones that would be tasked to carry out the actions in the [Consequences](#consequences)
section below.

Project administrators are also expected to keep this Code of Conduct updated with the main one housed at UCAR, as listed below in
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.

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
EthicsPoint Hotline](https://www2.fin.ucar.edu/ethics/anonymous-reporting).

Complaints received by UCAR will be handled pursuant to the procedures outlined in UCAR's Harassment Reporting and Complaint
Procedure.
Complaints to UCAR will be held as confidential as practicable under the circumstances, and retaliation against a person who
initiates a complaint or an inquiry about inappropriate behavior will not be tolerated.

Any Contributor can use these reporting methods even if they are not directly affiliated with UCAR.
The Frequently Asked Questions (FAQ) page for reporting is [here](https://www2.fin.ucar.edu/procedures/hr/reporting-faqs).

## Consequences
Upon receipt of a complaint, the project administrator(s) may take any action deemed necessary and appropriate under the
circumstances.
Such action can include things such as: removing, editing, or rejecting comments, commits, code, wiki edits, email, issues, and
other contributions that are not aligned to this Code of Conduct, or banning temporarily or permanently any contributor for other
behaviors that are deemed inappropriate, threatening, offensive, or harmful.
Project administrators also have the right to report violations to UCAR HR and/or UCAR's Office of Diversity, Equity and Inclusion
(ODEI), as well as a participant's home institution and/or law enforcement.
In the event an incident is reported to UCAR, UCAR will follow its Harassment Reporting and Complaint Procedure.

## Process for Changes
All UCAR managed projects are required to adopt this Contributor Code of Conduct.
Adoption is assumed even if not expressly stated in the repository.
Projects should fill in sections where prompted with project-specific information, including, project name and adoption date.

Projects that adopt this Code of Conduct need to stay up to date with UCAR's Contributor Code of Conduct, linked with a DOI in the
[Attribution](#attribution) section below.
Projects can make limited substantive changes to the Code of Conduct, however, the changes must be limited in scope and may not
contradict the UCAR Contributor Code of Conduct.

## Attribution
This Code of Conduct was originally adapted from the [Contributor Covenant](http://contributor-covenant.org/version/1/4), version
1.4.
We then aligned it with the UCAR Participant Code of Conduct, which also borrows from the American Geophysical Union (AGU) Code of
Conduct.
The UCAR Participant Code of Conduct applies to both UCAR employees as well as participants in activities run by UCAR.
The original version of this for all software projects that have strong management from UCAR or UCAR staff is available on the UCAR
website at https://doi.org/10.5065/6w2c-a132.
The date that it was adopted by this project was **Feb/13/2018**.
When responding to complaints, UCAR HR and ODEI will do so based on the latest published version.
Therefore, any project-specific changes should follow the [Process for Changes](#process-for-changes) section above.
4 changes: 2 additions & 2 deletions .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.7.7"
__version__ = "0.8.2"

def find_root_dir(filename=".gitmodules"):
""" finds the highest directory in tree
Expand All @@ -26,7 +26,7 @@ def find_root_dir(filename=".gitmodules"):

def get_parser():
description = """
%(prog)s manages checking out groups of gitsubmodules with addtional support for Earth System Models
%(prog)s manages checking out groups of gitsubmodules with additional support for Earth System Models
"""
parser = argparse.ArgumentParser(
description=description, formatter_class=argparse.RawDescriptionHelpFormatter
Expand Down
Loading