Merge lp:~stub/codetree/git-submodules into lp:codetree

[Stuart Bishop]

Expand git submodules on clone and update

For mojo to deploy operator framework charms from git branches, we need to expand embedded git submodules.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[lp:~stub/codetree/git-submodules]

115. By Stuart Bishop on 2020-04-08

delint

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 109

=== modified file 'codetree/config.py'
--- codetree/config.py	2020-04-08 09:59:03 +0000
+++ codetree/config.py	2020-04-08 09:59:03 +0000
@@ -159,12 +159,12 @@
             if parent in self.tree:
                 self.tree[parent].append(child)
             elif os.path.isdir(parent):
-                logging.warn("Parent directory {} is not specified ".format(parent) +
-                             "in the configuration, using existing directory")
+                logging.warn("Parent directory {} is not specified "
+                             "in the configuration, using existing directory".format(parent))
                 self.tree[''].append(child)
             else:
-                raise InvalidDirective("Parent directory {} ".format(parent) +
-                                       "does not exist and is not in the configuration")
+                raise InvalidDirective("Parent directory {} "
+                                       "does not exist and is not in the configuration".format(parent))
             # Add my list of children
             self.tree[child] = []
 

=== modified file 'codetree/handlers/charm.py'
--- codetree/handlers/charm.py	2020-04-08 09:59:03 +0000
+++ codetree/handlers/charm.py	2020-04-08 09:59:03 +0000
@@ -169,9 +169,8 @@
         # Verify SHA
         expected_sha = req.headers['Content-Sha384']
         if calculated_sha != expected_sha:
-            raise requests.HTTPError("SHA of downloaded charm {} didn't match " +
-                                     "expected SHA {}".format(calculated_sha,
-                                                              expected_sha))
+            raise requests.HTTPError("SHA of downloaded charm {} didn't match "
+                                     "expected SHA {}".format(calculated_sha, expected_sha))
 
         return zip_path
 

=== modified file 'codetree/handlers/git.py'
--- codetree/handlers/git.py	2020-04-08 09:59:03 +0000
+++ codetree/handlers/git.py	2020-04-08 09:59:03 +0000
@@ -105,6 +105,13 @@
         else:
             logging.info("Repository {} at revision {}".format(dest, revision))
 
+        # Update submodules
+        if not log_failure(
+            self._git_cmd(dest, 'submodule', 'update', '--init', '--recursive'),
+            'Updating submodules in repository {}'.format(dest),
+        ):
+            return result
+
         result.success = True
         result.revision = revision
         return result

=== modified file 'tests/test_config.py'
--- tests/test_config.py	2020-04-08 09:59:03 +0000
+++ tests/test_config.py	2020-04-08 09:59:03 +0000
@@ -115,7 +115,7 @@
         os.mkdir('dir')
         with mock.patch('logging.warn') as mock_log:
             conf = Config(test_filename)
-            mock_log.assert_called_once_with("Parent directory dir is not specified " +
+            mock_log.assert_called_once_with("Parent directory dir is not specified "
                                              "in the configuration, using existing directory")
             assert 'dir/subdir' in conf.tree['']