diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2024-10-24 08:55:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 08:55:14 +0200 |
| commit | d8c80747624e32ade173de081473782e3fb7eebe (patch) | |
| tree | 970a1b0920c12a4c49c07779c1bd35c97618f028 /lib | |
| parent | faeef6272dcf52acc87cad55e0fee0edba44ba49 (diff) | |
| download | spack-d8c80747624e32ade173de081473782e3fb7eebe.tar.gz spack-d8c80747624e32ade173de081473782e3fb7eebe.tar.bz2 spack-d8c80747624e32ade173de081473782e3fb7eebe.tar.xz spack-d8c80747624e32ade173de081473782e3fb7eebe.zip | |
bootstrap: add clingo 3.13 binaries and more (#47126)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/bootstrap/core.py | 8 | ||||
| -rw-r--r-- | lib/spack/spack/test/cmd/bootstrap.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/test/data/config/bootstrap.yaml | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/lib/spack/spack/bootstrap/core.py b/lib/spack/spack/bootstrap/core.py index e9c2975196..ba2afa8f7f 100644 --- a/lib/spack/spack/bootstrap/core.py +++ b/lib/spack/spack/bootstrap/core.py @@ -37,6 +37,7 @@ from llnl.util.lang import GroupedExceptionHandler import spack.binary_distribution import spack.config import spack.detection +import spack.mirror import spack.platforms import spack.spec import spack.store @@ -91,12 +92,7 @@ class Bootstrapper: self.metadata_dir = spack.util.path.canonicalize_path(conf["metadata"]) # Promote (relative) paths to file urls - url = conf["info"]["url"] - if spack.util.url.is_path_instead_of_url(url): - if not os.path.isabs(url): - url = os.path.join(self.metadata_dir, url) - url = spack.util.url.path_to_file_url(url) - self.url = url + self.url = spack.mirror.Mirror(conf["info"]["url"]).fetch_url @property def mirror_scope(self) -> spack.config.InternalConfigScope: diff --git a/lib/spack/spack/test/cmd/bootstrap.py b/lib/spack/spack/test/cmd/bootstrap.py index 888f823c55..03421ede77 100644 --- a/lib/spack/spack/test/cmd/bootstrap.py +++ b/lib/spack/spack/test/cmd/bootstrap.py @@ -170,7 +170,7 @@ def test_remove_and_add_a_source(mutable_config): assert not sources # Add it back and check we restored the initial state - _bootstrap("add", "github-actions", "$spack/share/spack/bootstrap/github-actions-v0.5") + _bootstrap("add", "github-actions", "$spack/share/spack/bootstrap/github-actions-v0.6") sources = spack.bootstrap.core.bootstrapping_sources() assert len(sources) == 1 diff --git a/lib/spack/spack/test/data/config/bootstrap.yaml b/lib/spack/spack/test/data/config/bootstrap.yaml index 4757b8729d..43c4405350 100644 --- a/lib/spack/spack/test/data/config/bootstrap.yaml +++ b/lib/spack/spack/test/data/config/bootstrap.yaml @@ -1,5 +1,5 @@ bootstrap: sources: - name: 'github-actions' - metadata: $spack/share/spack/bootstrap/github-actions-v0.5 + metadata: $spack/share/spack/bootstrap/github-actions-v0.6 trusted: {} |