Merge develop into main - 2025Jan06 #341
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Working mepo completion (#325) * mepo completion doesn't require the extra mepo-path.py anymore * Added option --location * Using "mepo --location" * Removed bin directory #322 * Updated CHANGALOG * Updated CHANGALOG * Include etc, bump minor version * Fix test for version * Add stash indicator to status (#327) * Add stash indicator to status * Add blobless clone * clone.py - (1) streamlined (2) branches are no longer in a detached state (3) updated tests (4) new tests * Black formatting changes * Updated test_mepo_clone.py to use https://github.com/pchakraborty/GEOSfvdycore-mepo-testing.git instead * Updated CHANGELOG * Some more refactoring * clone.py - updated comments * Added deprecation warning for 'mepo init' * init removal is a deprecation warning * Added missing space for --recurse-submodules. Also added a test where we clone a component with submodules * Update CHANGELOG for release (#332) * Update CHANGELOG for release * Update CHANGELOG.md --------- Co-authored-by: Matt Thompson <matthew.thompson@nasa.gov> --------- Co-authored-by: Matt Thompson <matthew.thompson@nasa.gov>
* Fixed a couple of bugs 1. shutil is required if --registry is passed 2. The function checkout_all_repos has the arg branch passed to it, not args, so use that instead * Added a test for mepo clone --allrepos * Added test for mepo clone --registry * Added Changelong entry, fixed test, made formatter happy * Bumped version * Fixed typo in Changelog * Fixed test for checking version
# Conflicts: # CHANGELOG.md # pyproject.toml # src/mepo/command/clone.py # tests/test_mepo_clone.py # tests/test_mepo_commands.py
pchakraborty
approved these changes
Jan 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By hand merge of
mainintodevelopas of 2025-Jan-06