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
Basic check for winsdk before concretizing #43752
Merged
scheibelp
merged 12 commits into
spack:develop
from
johnwparent:win/call-sdk-bootstrap-on-conc
May 2, 2024
Merged
Basic check for winsdk before concretizing #43752
scheibelp
merged 12 commits into
spack:develop
from
johnwparent:win/call-sdk-bootstrap-on-conc
May 2, 2024
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
johnwparent
force-pushed
the
win/call-sdk-bootstrap-on-conc
branch
from
April 23, 2024 20:02
ad78c71
to
cdf6a6f
Compare
johnwparent
force-pushed
the
win/call-sdk-bootstrap-on-conc
branch
from
April 26, 2024 18:14
b4df63f
to
93ab873
Compare
johnwparent
force-pushed
the
win/call-sdk-bootstrap-on-conc
branch
from
April 30, 2024 21:06
3636bd5
to
83c7dbf
Compare
scheibelp
requested changes
Apr 30, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have a couple minor requests about documentation. This generally looks good.
@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/bootstrap/core.py
lib/spack/spack/cmd/unit_test.py
lib/spack/spack/solver/asp.py
lib/spack/spack/test/conftest.py
==> Running isort checks
isort checks were clean
==> Running black checks
reformatted lib/spack/spack/solver/asp.py
All done! ✨ 🍰 ✨
1 file reformatted, 3 files left unchanged.
black checks were clean
==> Running flake8 checks
flake8 checks were clean
==> Running mypy checks
lib/spack/spack/version/version_types.py:145: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]" [arg-type]
lib/spack/spack/version/version_types.py:452: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]" [arg-type]
lib/spack/spack/version/version_types.py:481: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]" [arg-type]
Found 3 errors in 1 file (checked 623 source files)
mypy found errors
I've updated the branch with style fixes. |
scheibelp
approved these changes
May 1, 2024
wdconinc
pushed a commit
that referenced
this pull request
May 4, 2024
Adds a pre-concretization check for the Windows SDK and WGL (Windows GL) packages as non-buildable externals. This is a redo of #43459, but makes sure to modify the configuration scope outside of the bootstrap scope: whichever is highest-precedence in the user's environment at the time the concretization runs, which should either be an env scope or the ~ scope. Adds pytest fixture mocking the check for WGL and WSDK as if they were present.
tldahlgren
pushed a commit
to tldahlgren/spack
that referenced
this pull request
May 8, 2024
Adds a pre-concretization check for the Windows SDK and WGL (Windows GL) packages as non-buildable externals. This is a redo of spack#43459, but makes sure to modify the configuration scope outside of the bootstrap scope: whichever is highest-precedence in the user's environment at the time the concretization runs, which should either be an env scope or the ~ scope. Adds pytest fixture mocking the check for WGL and WSDK as if they were present.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Adds a pre-concretization check in asp.py for the Windows SDK and WGL (Windows GL) packages as non-buildable externals.
Previously this was incorporated into
ensure_core_depenendencies
in the bootstrap module, but that scoped the config modifications to the bootstrap scope, which made the changes fundamentally useless for general purpose use, so we transitioned to a pre concretization call to ensure these packages are always available pre concretization.The goal is to achieve parity with most unix-like systems where we have a consistent understanding of the system (potentially hardware accelerated) GL location and can reasonably rely on that heuristic to bake the external into packages.yaml.
Adds documentation to the startup guide denoting that the SDK is a hard requirement for Spack now.
Adds error handling if WGL and WSDK cannot be detected on system.
Adds pytest fixture mocking the check for WGL and WSDK as if they were present