Skip to content

solver: ensure commit variants enter dag hash#51190

Merged
psakievich merged 14 commits intospack:developfrom
psakievich:hash-to-hash
Aug 29, 2025
Merged

solver: ensure commit variants enter dag hash#51190
psakievich merged 14 commits intospack:developfrom
psakievich:hash-to-hash

Conversation

@psakievich
Copy link
Copy Markdown
Contributor

Resolves #51167 by moving the commit variant population before specs are finalized.

Resolves spack#51167 by moving the commit variant population before specs are
finalized.

Signed-off-by: psakiev <[email protected]>
@psakievich psakievich requested review from alalazo and becker33 August 20, 2025 22:31
@psakievich psakievich added bugfix Something wasn't working, here's a fix snl-core-team Issue for SNL Spack developers labels Aug 20, 2025
@psakievich psakievich added this to the v1.1.0 milestone Aug 20, 2025
@psakievich psakievich assigned psakievich and unassigned psakievich Aug 20, 2025
@psakievich
Copy link
Copy Markdown
Contributor Author

@spackbot fix style

@spackbot-app
Copy link
Copy Markdown

spackbot-app bot commented Aug 21, 2025

Let me see if I can fix that for you!

@spackbot-app
Copy link
Copy Markdown

spackbot-app bot commented Aug 21, 2025

I was able to run spack style --fix for you!

spack style --fix
==> Running style checks on spack
  selected: import, isort, black, flake8, mypy
==> Modified files
  lib/spack/spack/package_base.py
  lib/spack/spack/solver/asp.py
  lib/spack/spack/test/concretization/core.py
  lib/spack/spack/test/conftest.py
==> Running import checks
  import checks were clean
==> Running isort checks
  isort checks were clean
==> Running black checks
reformatted lib/spack/spack/test/concretization/core.py
All done! ✨ 🍰 ✨
1 file reformatted, 3 files left unchanged.
  black checks were clean
==> Running flake8 checks
  flake8 checks were clean
==> Running mypy checks
Success: no issues found in 616 source files
  mypy checks were clean
==> spack style checks were clean
Keep in mind that I cannot fix your flake8 or mypy errors, so if you have any you'll need to fix them and update the pull request. If I was able to push to your branch, if you make further changes you will need to pull from your updated branch before pushing again.

I've updated the branch with style fixes.

@haampie haampie added v1.0.2 PRs / Bug fixes to backport for v1.0.2 and removed backports labels Aug 21, 2025
@haampie
Copy link
Copy Markdown
Member

haampie commented Aug 21, 2025

FYI, if you need a feature backported, use one or more vX.Y.Z labels. The backports label is for backports PRs themselves.

@alalazo alalazo dismissed their stale review August 21, 2025 07:05

Overlooked deletion of xfaul mark

The stage check is no longer valid pre spec finalize. These unfinalized
specs should never have the same stage since we are adding a variant for
this method.

Signed-off-by: psakiev <[email protected]>
Signed-off-by: psakiev <[email protected]>
Move main docs to packaging and add a qualifying not in the git versions
section

Signed-off-by: psakiev <[email protected]>
Signed-off-by: psakiev <[email protected]>
Signed-off-by: psakiev <[email protected]>
Copy link
Copy Markdown
Contributor Author

@psakievich psakievich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leaving a comment since my phone is making all my comments be embedded in reviews.

Signed-off-by: psakiev <[email protected]>
@psakievich
Copy link
Copy Markdown
Contributor Author

@becker33 I just removed the word binary from the docs and call it git version provenance. I'm happy to rework the docs further if you have more concerns, but I'd like to do it in a follow on so the bug fix is live on develop.

@psakievich psakievich requested review from alalazo and becker33 August 27, 2025 19:48
becker33
becker33 previously approved these changes Aug 28, 2025
@becker33
Copy link
Copy Markdown
Member

Looks like the tests need to be updated for the changed method name, but otherwise LGTM

Signed-off-by: psakiev <[email protected]>
@psakievich psakievich merged commit 0a8474b into spack:develop Aug 29, 2025
33 checks passed
@psakievich psakievich deleted the hash-to-hash branch November 4, 2025 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix Something wasn't working, here's a fix snl-core-team Issue for SNL Spack developers v1.0.2 PRs / Bug fixes to backport for v1.0.2

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Branch-Based Git Versions For Packages Use the Same Package Hash, Despite Reserved commit Variant Changing

4 participants