Eliminate direct 'git_config' use in 'exts_list'. Clarify sanity checks done in fetch_source and fetch_sources.

Author: kelseymh

easybuild/framework/easyblock.py

@@ -341,7 +341,7 @@ def get_checksum_for(self, checksums, filename=None, index=None):
         else:
             raise EasyBuildError("Invalid type for checksums (%s), should be list, tuple or None.", type(checksums))
 
-    def fetch_source(self, source=None, checksum=None, extension=False):
+    def fetch_source(self, source, checksum=None, extension=False):
         """
         Get a specific source (tarball, iso, url)
         Will be tested for existence or can be located
@@ -353,7 +353,7 @@ def fetch_source(self, source=None, checksum=None, extension=False):
         filename, download_filename, extract_cmd, source_urls, git_config = None, None, None, None, None
 
         if source is None:
-            raise EasyBuildError("Fetch_source called without 'source' argument")
+            raise EasyBuildError("fetch_source called with empty 'source' argument")
         elif isinstance(source, string_type):
             filename = source
         elif isinstance(source, dict):
@@ -415,14 +415,14 @@ def fetch_sources(self, sources=None, checksums=None):
 
         # Loop over the list of sources; list of checksums must match >= in size
         for index, source in enumerate(sources):
-            if source:
-                got_src = self.fetch_source(source, self.get_checksum_for(checksums=checksums, index=index))
-                if got_src:
-                    self.src.append(got_src)
-                else:
-                    raise EasyBuildError("Unable to retrieve source %s", source)
+            if source is None:
+                raise EasyBuildError("Empty source in sources list at index %d", index)
+
+            src_spec = self.fetch_source(source, self.get_checksum_for(checksums=checksums, index=index))
+            if src_spec:
+                self.src.append(src_spec)
             else:
-                raise EasyBuildError("Empty source in list at index %d", index)
+                raise EasyBuildError("Unable to retrieve source %s", source)
 
         self.log.info("Added sources: %s", self.src)
 
@@ -549,17 +549,18 @@ def fetch_extension_sources(self, skip_checksums=False):
                         exts_sources.append(ext_src)
                     elif ext_options.get('sources', None):
                         sources = ext_options['sources']
+                        if isinstance(sources, (list,tuple)):
+                            raise EasyBuildError("'sources' entry to 'exts_list' must be a single dictionary.")
+
                         src = self.fetch_source(sources, checksums, extension=True)
                         # Copy 'path' entry to 'src' for use with extensions
                         ext_src.update({'src': src['path']})
                         exts_sources.append(ext_src)
                     else:
                         source_urls = ext_options.get('source_urls', [])
                         force_download = build_option('force_download') in [FORCE_DOWNLOAD_ALL, FORCE_DOWNLOAD_SOURCES]
-                        git_config = ext_options.get('git_config', None)
 
-                        src_fn = self.obtain_file(fn, extension=True, urls=source_urls, force_download=force_download,
-                                                  git_config=git_config)
+                        src_fn = self.obtain_file(fn, extension=True, urls=source_urls, force_download=force_download)
 
                         if src_fn:
                             ext_src.update({'src': src_fn})

test/framework/toy_build.py

@@ -1196,41 +1196,6 @@ def test_toy_extension_patches(self):
 
         self.test_toy_build(ec_file=test_ec)
 
-    def test_toy_extension_git(self):
-        """Test install toy that includes extensions with git_config."""
-        test_ecs = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'easyconfigs', 'test_ecs')
-        toy_ec = os.path.join(test_ecs, 't', 'toy', 'toy-0.0.eb')
-        toy_ec_txt = read_file(toy_ec)
-
-        # Tar-ball which should be created via 'git_config', and one file
-        ext_tgz = 'exts-git.tar.gz'
-        ext_tarball = os.path.join(self.test_sourcepath, 't', 'toy', ext_tgz)
-        ext_tarfile = 'a_directory/a_file.txt'
-
-        # Dummy source code required for extensions build_step to pass
-        ext_src = 'int main() { return 0; }'
-        ext_cfile = 'exts-git.c'
-
-        test_ec = os.path.join(self.test_prefix, 'test.eb')
-        test_ec_txt = '\n'.join([
-            toy_ec_txt,
-            'prebuildopts = "echo \\\"%s\\\" > %s && ",' % (ext_src, ext_cfile),
-            'exts_list = [',
-            '   ("exts-git", "0.0", {',
-            '       "buildopts": "&& ls -l %s %s",' % (ext_tarball, ext_tarfile),
-            '       "source_tmpl": "%s",' % ext_tgz,
-            '       "git_config": {',
-            '           "repo_name": "testrepository",',
-            '           "url": "https://github.com/easybuilders",',
-            '           "tag": "master",',
-            '       },',
-            '   }),',
-            ']',
-        ])
-        write_file(test_ec, test_ec_txt)
-
-        self.test_toy_build(ec_file=test_ec)
-
     def test_toy_extension_sources(self):
         """Test install toy that includes extensions with full sources."""
         test_ecs = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'easyconfigs', 'test_ecs')