Bugfix: fix sticky variants in externals #42253
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
spackbot-app
bot
added
core
|
@spackbot fix style |
|
Let me see if I can fix that for you! |
|
I was able to run spack style --fix==> Running style checks on spack
selected: isort, black, flake8, mypy
==> Modified files
lib/spack/spack/solver/asp.py
lib/spack/spack/test/concretize.py
==> Running isort checks
isort checks were clean
==> Running black checks
reformatted lib/spack/spack/test/concretize.py
reformatted lib/spack/spack/solver/asp.py
All done! ✨ 🍰 ✨
2 files reformatted.
black checks were clean
==> Running flake8 checks
flake8 checks were clean
==> Running mypy checks
Success: no issues found in 610 source files
mypy checks were clean
==> spack style checks were clean
I've updated the branch with style fixes. |
alalazo
requested changes
Jan 24, 2024
lib/spack/spack/test/concretize.py
Outdated
| @@ -1522,6 +1522,18 @@ def test_sticky_variant_in_package(self): | |||
| s = Spec("sticky-variant %clang").concretized() | |||
| assert s.satisfies("%clang") and s.satisfies("~allow-gcc") | |||
|
|
|||
| @pytest.mark.only_clingo("Original concretizer cannot use sticky variants") | |||
| def test_sticky_variant_in_external(self): | |||
There was a problem hiding this comment.
Suggested change
| def test_sticky_variant_in_external(self): | |
| @pytest.mark.regression("42172") | |
| def test_sticky_variant_in_external(self): | |
| """Tests that we can set sticky variants from an external spec.""" |
There was a problem hiding this comment.
Also, can we test setting the sticky variant both ways + not having it?
|
@spackbot fix style |
|
Let me see if I can fix that for you! |
|
I was able to run spack style --fix==> Running style checks on spack
selected: isort, black, flake8, mypy
==> Modified files
lib/spack/spack/solver/asp.py
lib/spack/spack/test/concretize.py
var/spack/repos/builtin.mock/packages/sticky-variant-dependent/package.py
==> Running isort checks
isort checks were clean
==> Running black checks
reformatted lib/spack/spack/test/concretize.py
All done! ✨ 🍰 ✨
1 file reformatted, 2 files left unchanged.
black checks were clean
==> Running flake8 checks
flake8 checks were clean
==> Running mypy checks
Success: no issues found in 610 source files
mypy checks were clean
==> spack style checks were clean
I've updated the branch with style fixes. |
alalazo
approved these changes
Jan 25, 2024
RikkiButler20
pushed a commit
to RikkiButler20/spack
that referenced
this pull request
Jan 25, 2024
RikkiButler20
pushed a commit
to RikkiButler20/spack
that referenced
this pull request
Jan 31, 2024
alalazo
pushed a commit
that referenced
this pull request
Feb 9, 2024
alalazo
pushed a commit
that referenced
this pull request
Feb 29, 2024
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #42172
Currently, the concretizer does not preserve information about which variants were set explicitly on externals, which leads to concretization failures when an external specifies a sticky variant. This PR fixes the generation of facts for externals to preserve that information.
Includes regression test.