mepo 2.3.0__tar.gz → 2.3.2__tar.gz

{mepo-2.3.0 → mepo-2.3.2}/CHANGELOG.md

@@ -13,6 +13,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [2.3.2] - 2025-04-24
+
+### Fixed
+
+- Fixed `checkout` command to use `--recurse-submodules` if component has submodules
+
+## [2.3.1] - 2025-04-16
+
+### Fixed
+
+- Fixed `clone` to allow for fixtures without a `develop:` key in `components.yaml`
+
 ## [2.3.0] - 2025-01-12
 
 ### Changed

{mepo-2.3.0 → mepo-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mepo
-Version: 2.3.0
+Version: 2.3.2
 Summary: A tool for managing (m)ultiple r(epo)s
 Author-email: GMAO SI Team <siteam@gmao.gsfc.nasa.gov>
 License-Expression: Apache-2.0

{mepo-2.3.0 → mepo-2.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mepo"
-version = "2.3.0"
+version = "2.3.2"
 description = "A tool for managing (m)ultiple r(epo)s"
 authors = [{name="GMAO SI Team", email="siteam@gmao.gsfc.nasa.gov"}]
 dependencies = [

{mepo-2.3.0 → mepo-2.3.2}/src/mepo/command/checkout-if-exists.py

@@ -30,4 +30,6 @@ def run(args):
                             colors.RESET + comp.name + colors.RESET,
                         )
                     )
-                git.checkout(ref_name, args.detach)
+                git.checkout(
+                    ref_name, detach=args.detach, recurse=comp.recurse_submodules
+                )

{mepo-2.3.0 → mepo-2.3.2}/src/mepo/command/checkout.py

@@ -30,7 +30,7 @@ def run(args):
                         colors.RESET + comp.name + colors.RESET,
                     )
                 )
-        git.checkout(branch, args.detach)
+        git.checkout(branch, detach=args.detach, recurse=comp.recurse_submodules)
 
 
 def _get_comps_to_checkout(specified_comps, allcomps):

{mepo-2.3.0 → mepo-2.3.2}/src/mepo/command/clone.py

@@ -68,7 +68,7 @@ def clone_fixture(url, branch=None, directory=None, partial=None):
         last_url_node = p.path.rsplit("/")[-1]
         directory = pathlib.Path(last_url_node).stem
     git = GitRepository(url, directory)
-    git.clone(branch, partial)
+    git.clone(branch, partial=partial)
     return directory
 
 
@@ -105,7 +105,7 @@ def clone_components(allcomps, partial):
         version = comp.version.name
         version = version.replace("origin/", "")
         git = GitRepository(comp.remote, comp.local)
-        git.clone(version, recurse_submodules, partial)
+        git.clone(version, recurse=recurse_submodules, partial=partial)
         if comp.sparse:
             git.sparsify(comp.sparse)
         print_clone_info(comp.name, comp.version, max_namelen)
@@ -123,4 +123,4 @@ def checkout_all_repos(allcomps, branch):
         branch_y = colors.YELLOW + branch + colors.RESET
         print(f"Checking out {branch_y} in {comp.name}")
         git = GitRepository(comp.remote, comp.local)
-        git.checkout(branch)
+        git.checkout(branch, recurse=comp.recurse_submodules)

{mepo-2.3.0 → mepo-2.3.2}/src/mepo/command/develop.py

@@ -20,5 +20,5 @@ def run(args):
                     colors.RESET + comp.name + colors.RESET,
                 )
             )
-        git.checkout(comp.develop)
+        git.checkout(comp.develop, recurse=comp.recurse_submodules)
         _ = git.pull()

{mepo-2.3.0 → mepo-2.3.2}/src/mepo/command/restore-state.py

@@ -41,4 +41,4 @@ def restore_state(allcomps, result):
                     colors.RED + current_version + colors.RESET,
                 )
             )
-            git.checkout(comp.version.name)
+            git.checkout(comp.version.name, recurse=comp.recurse_submodules)

{mepo-2.3.0 → mepo-2.3.2}/src/mepo/git.py

@@ -60,10 +60,12 @@ class GitRepository:
         shellcmd.run(shlex.split(cmd))
 
         if version is not None:
-            self.checkout(version)
+            self.checkout(version, recurse=recurse)
 
-    def checkout(self, version, detach=False):
+    def checkout(self, version, detach=False, recurse=None):
         cmd = self.__git + " checkout "
+        if recurse is not None:
+            cmd += " --recurse-submodules "
         cmd += "--quiet {}".format(version)
         shellcmd.run(shlex.split(cmd))
         if detach:

{mepo-2.3.0 → mepo-2.3.2}/src/mepo/registry.py

@@ -35,9 +35,11 @@ class Registry(object):
         num_fixtures = 0
         for k, v in d.items():
             if "fixture" in v:
-                # In case of a fixture, develop is the only additional key
+                # In case of a fixture, develop is the only additional allowed key
                 num_fixtures += 1
-                assert list(v.keys()) == ["fixture", "develop"]
+                required_ = ["fixture"]
+                optional_ = ["develop"]
+                assert list(v.keys()) in (required_, required_ + optional_)
             else:
                 # For non-fixture, one and only one of branch/tag/hash allowed
                 xsection = git_tag_types.intersection(set(v.keys()))

{mepo-2.3.0 → mepo-2.3.2}/tests/test_mepo_commands.py

@@ -337,7 +337,7 @@ class TestMepoCommands(unittest.TestCase):
             self.__class__.__mepo_clone()
 
     def test_mepo_version(self):
-        self.assertEqual(get_mepo_version(), "2.3.0")
+        self.assertEqual(get_mepo_version(), "2.3.2")
 
     def tearDown(self):
         pass