release/1.5.1: fix py-pandas/py-openpyxl version incompatibility, fix ectrans variants mkl/fftw#342
Merged
climbfuji merged 2 commits intoJCSDA:release/1.5.1from Oct 13, 2023
Conversation
climbfuji
requested review from
AlexanderRichert-NOAA,
natalie-perlin,
srherbener and
ulmononian
srherbener
approved these changes
Oct 12, 2023
ulmononian
approved these changes
Oct 13, 2023
Collaborator
Author
|
I know from the spack PRs that there will be updates to these commits, but for release/1.5.1 this is good enough. I will try to cherry-pick the changes in this PR, then apply the updates from spack develop, when I merge this back to |
climbfuji
deleted the
bugfix/rel_151_pandas_openpyxl_and_ectrans_fftw_mkl
branch
3 tasks
climbfuji
pushed a commit
that referenced
this pull request
Jan 21, 2026
This can be merged once packages #342 is merge Signed-off-by: Ryan Krattiger <[email protected]>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
This time I am doing it the other way round, add to
release/1.5.1and then merge back to develop by cherry-picking the commits ...py-openpyxland the version requirement inpy-pandas.ectransspack-stack#820 by explicitly asking formkl(which itself is a virtual provider) orfftw(which is a package) instead offftw-api(which is a virtual provider and can befftwormkl). We'll likely want to redo some of this in a cleaner way when we work on Switch to Intel MKL on systems with Intel compiler spack-stack#759 in the future.For testing, see JCSDA/spack-stack#821
Issue(s) addressed
Resolves JCSDA/spack-stack#818
Resolves JCSDA/spack-stack#820
Dependencies
n/a
Impact
None
Checklist
I have made corresponding changes to the documentation