zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bindist network issues (#25587)

Browse Source 
* Fix bindist network issues

* Another one using the network
This commit is contained in:
Harmen Stoppels
2021-08-24 19:09:23 +02:00
committed by GitHub
parent 107693fbd1
commit 73208f5835
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/test/modules/lmod.py
View File

@@ -339,7 +339,9 @@ def test_config_backwards_compat(self, mutable_config):
assert old_format == settings['lmod'] assert old_format == settings['lmod']
def test_modules_relative_to_view( 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: with ev.Environment(str(tmpdir), with_view=True) as e:
module_configuration('with_view') module_configuration('with_view')
install('cmake') install('cmake')

6
var/spack/repos/builtin.mock/packages/corge/package.py
View File

@@ -14,10 +14,8 @@ class Corge(Package):
"""A toy package to test dependencies""" """A toy package to test dependencies"""
homepage = "https://www.example.com" homepage = "https://www.example.com"
url = "https://github.com/gartung/corge/archive/v3.0.0.tar.gz" has_code = False
version('3.0.0')
version('3.0.0',
sha256='5058861c3b887511387c725971984cec665a8307d660158915a04d7786fed6bc')
depends_on('quux') depends_on('quux')

6
var/spack/repos/builtin.mock/packages/garply/package.py
View File

@@ -14,10 +14,8 @@ class Garply(Package):
"""Toy package for testing dependencies""" """Toy package for testing dependencies"""
homepage = "https://www.example.com" homepage = "https://www.example.com"
url = "https://github.com/gartung/garply/archive/v3.0.0.tar.gz" has_code = False
version('3.0.0')
version('3.0.0',
sha256='534ac8ba7a6fed7e8bbb543bd43ca04999e65337445a531bd296939f5ac2f33d')
def install(self, spec, prefix): def install(self, spec, prefix):
garply_h = '''#ifndef GARPLY_H_ garply_h = '''#ifndef GARPLY_H_

7
var/spack/repos/builtin.mock/packages/quux/package.py
View File

@@ -14,10 +14,8 @@ class Quux(Package):
"""Toy package for testing dependencies""" """Toy package for testing dependencies"""
homepage = "https://www.example.com" homepage = "https://www.example.com"
url = "https://github.com/gartung/quux/archive/v3.0.0.tar.gz" has_code = False
version('3.0.0')
version('3.0.0',
sha256='b91bc96fb746495786bddac2c527039177499f2f76d3fa9dcf0b393859e68484')
depends_on('garply') depends_on('garply')
@@ -90,6 +88,7 @@ class Quux
const int quux_version_minor = %s; const int quux_version_minor = %s;
''' '''
mkdirp('%s/quux' % prefix.include) 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: with open('%s/quux_version.h' % self.stage.source_path, 'w') as f:
f.write(quux_version_h % (self.version[0], self.version[1:])) f.write(quux_version_h % (self.version[0], self.version[1:]))
with open('%s/quux/quux.cc' % self.stage.source_path, 'w') as f: with open('%s/quux/quux.cc' % self.stage.source_path, 'w') as f: