From 73208f58359bcd60a0375711a18d64c7c133d09d Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Tue, 24 Aug 2021 19:09:23 +0200 Subject: Fix bindist network issues (#25587) * Fix bindist network issues * Another one using the network --- lib/spack/spack/test/modules/lmod.py | 4 +++- var/spack/repos/builtin.mock/packages/corge/package.py | 6 ++---- var/spack/repos/builtin.mock/packages/garply/package.py | 6 ++---- var/spack/repos/builtin.mock/packages/quux/package.py | 7 +++---- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/spack/spack/test/modules/lmod.py b/lib/spack/spack/test/modules/lmod.py index 5f839085fa..861f78c7b8 100644 --- a/lib/spack/spack/test/modules/lmod.py +++ b/lib/spack/spack/test/modules/lmod.py @@ -339,7 +339,9 @@ class TestLmod(object): assert old_format == settings['lmod'] def test_modules_relative_to_view( - self, tmpdir, modulefile_content, module_configuration, install_mockery): + self, tmpdir, modulefile_content, module_configuration, install_mockery, + mock_fetch + ): with ev.Environment(str(tmpdir), with_view=True) as e: module_configuration('with_view') install('cmake') diff --git a/var/spack/repos/builtin.mock/packages/corge/package.py b/var/spack/repos/builtin.mock/packages/corge/package.py index 6f6efb6b6e..2fd2b23038 100644 --- a/var/spack/repos/builtin.mock/packages/corge/package.py +++ b/var/spack/repos/builtin.mock/packages/corge/package.py @@ -14,10 +14,8 @@ class Corge(Package): """A toy package to test dependencies""" homepage = "https://www.example.com" - url = "https://github.com/gartung/corge/archive/v3.0.0.tar.gz" - - version('3.0.0', - sha256='5058861c3b887511387c725971984cec665a8307d660158915a04d7786fed6bc') + has_code = False + version('3.0.0') depends_on('quux') diff --git a/var/spack/repos/builtin.mock/packages/garply/package.py b/var/spack/repos/builtin.mock/packages/garply/package.py index 534dffb55c..6f028eec31 100644 --- a/var/spack/repos/builtin.mock/packages/garply/package.py +++ b/var/spack/repos/builtin.mock/packages/garply/package.py @@ -14,10 +14,8 @@ class Garply(Package): """Toy package for testing dependencies""" homepage = "https://www.example.com" - url = "https://github.com/gartung/garply/archive/v3.0.0.tar.gz" - - version('3.0.0', - sha256='534ac8ba7a6fed7e8bbb543bd43ca04999e65337445a531bd296939f5ac2f33d') + has_code = False + version('3.0.0') def install(self, spec, prefix): garply_h = '''#ifndef GARPLY_H_ diff --git a/var/spack/repos/builtin.mock/packages/quux/package.py b/var/spack/repos/builtin.mock/packages/quux/package.py index ec28f6f2ef..676b1c1f0b 100644 --- a/var/spack/repos/builtin.mock/packages/quux/package.py +++ b/var/spack/repos/builtin.mock/packages/quux/package.py @@ -14,10 +14,8 @@ class Quux(Package): """Toy package for testing dependencies""" homepage = "https://www.example.com" - url = "https://github.com/gartung/quux/archive/v3.0.0.tar.gz" - - version('3.0.0', - sha256='b91bc96fb746495786bddac2c527039177499f2f76d3fa9dcf0b393859e68484') + has_code = False + version('3.0.0') depends_on('garply') @@ -90,6 +88,7 @@ main() const int quux_version_minor = %s; ''' mkdirp('%s/quux' % prefix.include) + mkdirp('%s/quux' % self.stage.source_path) with open('%s/quux_version.h' % self.stage.source_path, 'w') as f: f.write(quux_version_h % (self.version[0], self.version[1:])) with open('%s/quux/quux.cc' % self.stage.source_path, 'w') as f: -- cgit v1.2.3-60-g2f50