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

Cesm3.0 alpha02b #261

Merged
merged 71 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
31975f3
working on cesm3_0_alpha02a
jedwards4b Jun 26, 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
acee7aa
update submodules
jedwards4b Jun 26, 2024
9455d93
update user_nl_mosart
jedwards4b Jun 26, 2024
6da0eb7
update branchs
jedwards4b Jun 26, 2024
77aa9ac
Merge commit '53220198c5e53fd11026df8ef71b11ef4d5a3233' into cesm3.0-…
jedwards4b Jun 26, 2024
f66ef8c
working dglc now
jedwards4b Jun 28, 2024
3e79138
add fleximod test workflow
jedwards4b Jun 28, 2024
ee9ede4
add fleximod test workflow
jedwards4b Jun 28, 2024
d05418f
add fleximod test workflow
jedwards4b Jun 28, 2024
e6ffb82
add fleximod test workflow
jedwards4b Jun 28, 2024
bd2b1a0
add fleximod test workflow
jedwards4b Jun 28, 2024
2d4e595
add fleximod test workflow
jedwards4b Jun 28, 2024
6ab7cfd
add fleximod test workflow
jedwards4b Jun 28, 2024
589ad84
matrix of python versions
jedwards4b Jun 28, 2024
6af2e4a
matrix of python versions
jedwards4b Jun 28, 2024
de2e57b
matrix of python versions
jedwards4b Jun 28, 2024
a2e7f69
update code first
jedwards4b Jun 28, 2024
87e7662
update code first
jedwards4b Jun 28, 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
3142760
update externals and compset names and aliases
jedwards4b Jul 5, 2024
80f7b7e
Merge commit '6ccf6171f1e828d049d8ba2058bd1effec6198cb' into cesm3.0-…
jedwards4b Jul 5, 2024
10546a8
update git-fleximod to v0.8.0
jedwards4b Jul 5, 2024
c624b61
Bump to 0.8.0
jedwards4b Jul 5, 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
a6e43fc
Bump to 0.8.1
jedwards4b Jul 8, 2024
d3d8006
update externals
jedwards4b Jul 8, 2024
ff964b7
update git-fleximod to v0.8.1
jedwards4b Jul 8, 2024
6bc7b0c
update fully coupled compset names
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
81da998
update externals
jedwards4b Jul 9, 2024
611db33
Merge commit '75a03373577f5ed19a00d2c387ca36bff1172d76' into cesm3.0-…
jedwards4b Jul 9, 2024
aaf1516
Update for cesm3_0_alpha02a
fischer-ncar Jul 10, 2024
5026d6a
Fix ccs_config typo in tag name.
fischer-ncar Jul 11, 2024
6403354
resolve conflicts with alpha2a created
jedwards4b Jul 22, 2024
153905a
Merge branch 'master' into cesm3.0-alphabranch
jedwards4b Jul 22, 2024
50f5782
updates for alpha02b
jedwards4b Jul 23, 2024
dd74438
merge commit
jedwards4b Jul 23, 2024
6ee78d6
correct count of test fails
jedwards4b Jul 23, 2024
733fcf2
update git-fleximod to count test fails correctly
jedwards4b Jul 23, 2024
f0b8858
update to catch test
jedwards4b Jul 23, 2024
0cab2f5
add pelayout for MT fully coupled case
jedwards4b Jul 25, 2024
0a4ea71
update the way tags are identified
jedwards4b Jul 25, 2024
654d233
Merge pull request #57 from ESMCI/fix_test_output
jedwards4b Jul 25, 2024
36b4b92
Bump to 0.8.3
jedwards4b Jul 25, 2024
f83a484
update git-fleximod to v0.8.3
jedwards4b Jul 25, 2024
e1f5a38
update externals
jedwards4b Jul 25, 2024
e705f72
fix hash id and tag parsing
jedwards4b Jul 25, 2024
548e0b3
update cam external
jedwards4b Jul 25, 2024
7fc2aef
update fully coupled test list
jedwards4b Jul 25, 2024
1ee334a
Merge pull request #58 from ESMCI/fix/hashid
jedwards4b Jul 25, 2024
8f78adc
Bump to 0.8.4
jedwards4b Jul 25, 2024
0313eb2
Merge commit '8f78adcb0386cf496de377b9a92705e44f3f9a37' into cesm3.0-…
jedwards4b Jul 25, 2024
4cac3e5
update cmeps
jedwards4b Jul 25, 2024
66e11fc
Update for cesm3_0_alpha02b
fischer-ncar Jul 29, 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
24 changes: 24 additions & 0 deletions .github/workflows/fleximod_test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
jobs:
fleximod-test:
runs-on: ubuntu-latest
strategy:
matrix:
# oldest supported and latest supported
python-version: ["3.7", "3.x"]
steps:
- id: checkout-CESM
uses: actions/checkout@v4
- id: run-fleximod
run: |
$GITHUB_WORKSPACE/bin/git-fleximod update
$GITHUB_WORKSPACE/bin/git-fleximod test
# - name: Setup tmate session
# if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3


25 changes: 9 additions & 16 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
path = share
url = https://github.com/ESCOMP/CESM_share
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
fxtag = share1.0.19
fxtag = share1.1.2
fxrequired = ToplevelRequired

[submodule "cime"]
Expand All @@ -48,13 +48,6 @@
fxtag = cime6.0.246
fxrequired = ToplevelRequired

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

[submodule "mpi-serial"]
path = libraries/mpi-serial
url = https://github.com/ESMCI/mpi-serial
Expand All @@ -66,7 +59,7 @@
path = components/cam
url = https://www.github.com/ESCOMP/CAM
fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
fxtag = cam6_3_162
fxtag = cam6_4_001
fxrequired = ToplevelRequired

[submodule "ww3"]
Expand All @@ -81,7 +74,7 @@
url = https://github.com/ESCOMP/RTM
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
fxrequired = ToplevelRequired
fxtag = rtm1_0_79
fxtag = rtm1_0_80

[submodule "pysect"]
path = tools/statistical_ensemble_test/pyCECT
Expand All @@ -95,14 +88,14 @@
url = https://github.com/ESCOMP/MOSART
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
fxrequired = ToplevelRequired
fxtag = mosart1_0_49
fxtag = mosart1.1.02

[submodule "mizuroute"]
path = components/mizuroute
url = https://github.com/ESCOMP/mizuRoute
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
fxrequired = ToplevelRequired
fxtag = cesm-coupling.n02_v2.1.2
fxtag = cesm-coupling.n02_v2.1.3

[submodule "fms"]
path = libraries/FMS
Expand All @@ -123,14 +116,14 @@
url = https://github.com/ESCOMP/CDEPS
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS
fxrequired = ToplevelRequired
fxtag = cdeps1.0.37
fxtag = cdeps1.0.43

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

[submodule "cice"]
path = components/cice
Expand All @@ -143,15 +136,15 @@
path = components/cism
url = https://github.com/ESCOMP/cism-wrapper.git
fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git
fxtag = cismwrap_2_2_001
fxtag = cismwrap_2_2_002
fxrequired = ToplevelRequired

[submodule "clm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
fxrequired = ToplevelRequired
fxtag = ctsm5.2.007
fxtag = ctsm5.2.008

[submodule "mom"]
path = components/mom
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.
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.7.8"
__version__ = "0.7.9"

def find_root_dir(filename=".gitmodules"):
""" finds the highest directory in tree
Expand Down
2 changes: 1 addition & 1 deletion .lib/git-fleximod/git_fleximod/git_fleximod.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ def submodules_test(gitmodules, root_dir):
# and that sparse checkout files exist
for name in gitmodules.sections():
url = gitmodules.get(name, "url")
fxurl = gitmodules.get(name, "fxDONOTMODIFYurl")
fxurl = gitmodules.get(name, "fxDONOTUSEurl")
fxsparse = gitmodules.get(name, "fxsparse")
path = gitmodules.get(name, "path")
fxurl = fxurl[:-4] if fxurl.endswith(".git") else fxurl
Expand Down
Loading
Loading