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.

Sign up for GitHub

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

Jump to bottom

Update git-fleximod to v0.8.2 #2639

Closed
wants to merge 6 commits into from
Closed

Update git-fleximod to v0.8.2 #2639

wants to merge 6 commits into from

Conversation

ekluzek
Copy link
Collaborator

@ekluzek ekluzek commented Jul 11, 2024

Description of changes

Same as #2631, but on b4b-dev

Specific notes

Contributors other than yourself, if any: @jedwards4b

CTSM Issues Fixed (include github issue #):

Are answers expected to change (and if so in what way)? No

Any User Interface Changes (namelist or namelist defaults changes)? No

Does this create a need to change or add documentation? Did you do so? No

Testing performed, if any: Ran git-fleximod on Derecho and Izumi

@ekluzek
Squashed '.lib/git-fleximod/' changes from a354b05..a60032499
f2e3334 
a60032499 Merge tag 'v0.8.2' into tmp-release
75a0337 Bump to 0.8.2
7136066 Merge pull request ESCOMP#54 from ESMCI/fix/tag-not-found
a90de4f update to fetch tag first
a6e43fc Bump to 0.8.1
229ba03 Merge pull request ESCOMP#53 from ESMCI/fix/ssh_access
e9cd2be better fix for issue with ssh access
c624b61 Bump to 0.8.0
6ccf617 Merge pull request ESCOMP#51 from ESMCI/fix/recursive
53fce57 no need to make submodule objects persist
dae1c82 now working with issue ESCOMP#50
ded91fd all tests passing, issue ESCOMP#50 fixed
62a338b all pytests now passing
143abac tests a-d all pass
2b021fd add documentation to submodule.py
72211d2 add the new submodule class
82dd7a4 test_b_update now working
a7d8b4e all pytests passing
5322019 Bump to 0.7.9
1f07cb6 Merge pull request ESCOMP#49 from ESMCI/fix/fxDONOTUSEurl
31ce71b use poetry update to update poetry.lock file
46043f0 add code of conduct (issue ESCOMP#35)
0c3d683 dependabot changes and issue ESCOMP#48
25ccc15de Merge tag 'v0.7.8' into tmp-release
8eae7e3 Bump to 0.7.8
34daa06 Merge pull request ESCOMP#46 from ESMCI/add_optional_keyword
af12c80 fix spelling
7ea36dc remove manage_externals error
2ede182 add optional to status output
4ff1e98de Merge tag 'v0.7.7' into tmp-release
87640ad Bump to 0.7.7
c124dc5 Merge pull request ESCOMP#43 from ESMCI/fix/root_dir
3ff935b update tests
0593149 one more improvement
d95f5d6 fix status issue
c304487 update complex test
a34070b Bump to 0.7.6
9e5d5f7 Merge pull request ESCOMP#40 from ESMCI/fix/change_url
00b7b38 some fixes when modifying url

git-subtree-dir: .lib/git-fleximod
git-subtree-split: a600324993623cba8e663fcbfdb6a0f6832dd802
@ekluzek
Merge commit 'f2e33342d4fab956915a224566003fb40e61f990' into gitflexi…
7b10e61 
…modupdatev0.8.2

 Conflicts:
	.lib/git-fleximod/git_fleximod/utils.py
@ekluzek ekluzek added the enhancement new capability or improved behavior of existing capability label Jul 11, 2024
@ekluzek ekluzek self-assigned this Jul 11, 2024
@ekluzek
Merge branch 'b4b-dev' into gitfleximodupdatev0.8.2
1ebb862 
Make sure git-fleximod is pointing to 0.8.2
 Conflicts:
	.lib/git-fleximod/git_fleximod/cli.py
	.lib/git-fleximod/git_fleximod/git_fleximod.py
	.lib/git-fleximod/pyproject.toml
	.lib/git-fleximod/tbump.toml
@ekluzek
Fix fates test URL so that 'git fleximod test' works
49f2c6e
@ekluzek
Copy link
Collaborator Author

ekluzek commented Jul 15, 2024 •
edited
Loading

I see the follow for git fleximod status which looks like errors, but I think it's actually OK:

./bin/git-fleximod status
                 fates at tag sci.1.73.0_api.35.0.0
                  cism at tag cismwrap_2_2_001
                     source_cism at tag cism_main_2.01.013
                   rtm at tag rtm1_0_79
                mosart at tag mosart1_0_49
             mizuRoute at tag cesm-coupling.n02_v2.1.2
            ccs_config at tag ccs_config_cesm0.0.106
                  cime at tag cime6.0.246
          e    CIME/non_py/cprnc has no fxtag defined in .gitmodules, module at v1.0.6
s                cmeps wavice 6384ff4e is out of sync with .gitmodules cmeps0.14.63
                 cdeps at tag cdeps1.0.34
                             fox at tag 4.1.2.1
                          genf90 at hash 4816965
                 share at tag share1.0.19
                   mct at tag MCT_2.11.0
            parallelio at tag pio2_6_2
e          doc-builder not checked out, aligned at tag v1.0.8 (optional)
    testfails = 2, local mods = 0, needs updates 11

In contrast with 0.7.8 I don't see errors:

./bin/git-fleximod status
                 fates at tag sci.1.73.0_api.35.0.0
                  cism at tag cismwrap_2_2_001
                   rtm at tag rtm1_0_79
                mosart at tag mosart1_0_49
             mizuRoute at tag cesm-coupling.n02_v2.1.2
            ccs_config at tag ccs_config_cesm0.0.106
                  cime at tag cime6.0.246
                 cmeps at tag cmeps0.14.63
                 cdeps at tag cdeps1.0.34
                 share at tag share1.0.19
                   mct at tag MCT_2.11.0
            parallelio at tag pio2_6_2
e          doc-builder not checked out, aligned at tag v1.0.8 (optional)
    testfails = 0, local mods = 0, needs updates 1

@ekluzek ekluzek mentioned this pull request Jul 16, 2024
Closed
@ekluzek
Copy link
Collaborator Author

ekluzek commented Jul 16, 2024

We'll pause on this to sort out the above error. Likely need to wait until Jim is back...

@samsrabin samsrabin added simple bfb bit-for-bit and removed simple bfb labels Aug 8, 2024
@ekluzek
Squashed '.lib/git-fleximod/' changes from a60032499..8f78adcb0
c37ca3f 
8f78adcb0 Bump to 0.8.4
1ee334a89 Merge pull request ESCOMP#58 from ESMCI/fix/hashid
e705f7268 fix hash id and tag parsing
36b4b921c Bump to 0.8.3
654d2336a Merge pull request ESCOMP#57 from ESMCI/fix_test_output
0a4ea71b8 update the way tags are identified
6ee78d6b4 correct count of test fails
REVERT: a60032499 Merge tag 'v0.8.2' into tmp-release
REVERT: 25ccc15de Merge tag 'v0.7.8' into tmp-release
REVERT: 4ff1e98de Merge tag 'v0.7.7' into tmp-release

git-subtree-dir: .lib/git-fleximod
git-subtree-split: 8f78adcb0386cf496de377b9a92705e44f3f9a37
@ekluzek
Merge commit 'c37ca3fe32b576f9123614874328ce809a1fa1cc' into gitflexi…
8bb0934 
…modupdatev0.8.2
@wwieder
Copy link
Contributor

wwieder commented Sep 25, 2024

Is this ready for b4b dev?

@jedwards4b
Copy link
Contributor

jedwards4b commented Sep 25, 2024 •
edited
Loading

@wwieder this is way way behind - git-fleximod is in version 0.9.2 - I recommend updating directly to that version.

@jedwards4b jedwards4b mentioned this pull request Sep 25, 2024
Open
@jedwards4b
Copy link
Contributor

Superseded by #2786

@jedwards4b jedwards4b closed this Sep 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ekluzek ekluzek

Labels
bfb bit-for-bit enhancement new capability or improved behavior of existing capability
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ekluzek @wwieder @jedwards4b @samsrabin