Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backports v0.22.0 #44070

Merged
merged 7 commits into from
May 8, 2024
Merged

Backports v0.22.0 #44070

merged 7 commits into from
May 8, 2024

Conversation

@spackbot-app spackbot-app bot added the core PR affects Spack core functionality label May 8, 2024
@haampie haampie mentioned this pull request May 8, 2024
7 tasks
haampie and others added 5 commits May 8, 2024 09:04
Add the ability to include any number of (potentially nested) concrete environments, e.g.:

```yaml
   spack:
     specs: []
     concretizer:
         unify: true
     include_concrete:
     - /path/to/environment1
     - /path/to/environment2
```

or, from the CLI:

```console
   $ spack env create myenv
   $ spack -e myenv add python
   $ spack -e myenv concretize
   $ spack env create --include-concrete myenv included_env
```

The contents of included concrete environments' spack.lock files are
included in the environment's lock file at creation time. Any changes
to included concrete environments are only reflected after the environment
is re-concretized from the re-concretized included environments.

- [x] Concretize included envs
- [x] Save concrete specs in memory by hash
- [x] Add included envs to combined env's lock file
- [x] Add test
- [x] Update documentation

    Co-authored-by: Kayla Butler <<butler59@llnl.gov>
    Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.co
m>
    Co-authored-by: Todd Gamblin <tgamblin@llnl.gov>
    Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>
@spackbot-app spackbot-app bot added commands documentation Improvements or additions to documentation environments gitlab Issues related to gitlab integration shell-support tests General test capability(ies) labels May 8, 2024
Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>
@alalazo
Copy link
Member

alalazo commented May 8, 2024

Should we get everything, but the version update, already into the release branch, if CI passes? In that way we can prepare the tutorial with a version reflecting all the major changes in v0.22

@haampie
Copy link
Member Author

haampie commented May 8, 2024

last time we just used the backports branch for prep

@haampie haampie merged commit 965bb4d into releases/v0.22 May 8, 2024
7 of 8 checks passed
@haampie haampie deleted the backports/v0.22.0 branch May 8, 2024 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backports commands core PR affects Spack core functionality documentation Improvements or additions to documentation environments gitlab Issues related to gitlab integration new-version patch R shell-support tests General test capability(ies) update-package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants