Skip to content

ROOT: add math/gsl conflict and change version-dependent features to conditional variants#34244

Merged
tldahlgren merged 4 commits intospack:developfrom
sethrj:root-conflicts
Dec 2, 2022
Merged

ROOT: add math/gsl conflict and change version-dependent features to conditional variants#34244
tldahlgren merged 4 commits intospack:developfrom
sethrj:root-conflicts

Conversation

@sethrj
Copy link
Copy Markdown
Contributor

@sethrj sethrj commented Dec 1, 2022

No description provided.

@sethrj
Copy link
Copy Markdown
Contributor Author

sethrj commented Dec 1, 2022

@spackbot fix style

@spackbot-app
Copy link
Copy Markdown

spackbot-app bot commented Dec 1, 2022

Let me see if I can fix that for you!

@spackbot-app
Copy link
Copy Markdown

spackbot-app bot commented Dec 1, 2022

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

spack style --fix
==> Running style checks on spack
  selected: isort, mypy, black, flake8
==> Modified files
  var/spack/repos/builtin/packages/root/package.py
==> Running isort checks
  isort checks were clean
==> Running mypy checks
lib/spack/llnl/util/lock.py:83: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs  [annotation-unchecked]
lib/spack/llnl/util/lang.py:1048: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs  [annotation-unchecked]
lib/spack/spack/bootstrap.py:89: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs  [annotation-unchecked]
Success: no issues found in 558 source files
  mypy checks were clean
==> Running black checks
reformatted var/spack/repos/builtin/packages/root/package.py
All done! ✨ 🍰 ✨
1 file reformatted.
  black checks were clean
==> Running flake8 checks
  flake8 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.

@drbenmorgan
Copy link
Copy Markdown
Member

I think this is fine, and along the same lines as #34185 though addressing different variants. So I'm fine with the changes here, though @HadrienG2 and @vvolkl should have final say!

Copy link
Copy Markdown
Contributor

@tldahlgren tldahlgren left a comment

Choose a reason for hiding this comment

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

LGTM

@tldahlgren tldahlgren enabled auto-merge (squash) December 1, 2022 19:01
@sethrj
Copy link
Copy Markdown
Contributor Author

sethrj commented Dec 2, 2022

@spackbot run pipeline

@spackbot-app
Copy link
Copy Markdown

spackbot-app bot commented Dec 2, 2022

I've started that pipeline for you!

@tldahlgren tldahlgren merged commit 3afe6f1 into spack:develop Dec 2, 2022
@sethrj sethrj deleted the root-conflicts branch December 2, 2022 20:35
luke-dt pushed a commit to dantaslab/spack that referenced this pull request Dec 5, 2022
…conditional variants (spack#34244)

* ROOT: add GSL/math dependency
* ROOT: use conditional variants instead of conflicts
amd-toolchain-support pushed a commit to amd-toolchain-support/spack that referenced this pull request Feb 16, 2023
…conditional variants (spack#34244)

* ROOT: add GSL/math dependency
* ROOT: use conditional variants instead of conflicts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants