Skip to content

release/1.5.1: fix py-pandas/py-openpyxl version incompatibility, fix ectrans variants mkl/fftw #342

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.

Sign up for GitHub

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

Merged
climbfuji merged 2 commits into from
Oct 13, 2023
Merged

release/1.5.1: fix py-pandas/py-openpyxl version incompatibility, fix ectrans variants mkl/fftw #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
364e811
Fix version incompatibilities of py-pandas and py-openpyxl
climbfuji Oct 11, 2023
b89f88d
Fix fftw/mkl variants for ectrans
climbfuji Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion var/spack/repos/builtin/packages/ectrans/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ class Ectrans(CMakePackage):
depends_on("mpi", when="+mpi")
depends_on("blas")
depends_on("lapack")
depends_on("fftw-api", when="+fftw")
# ectrans distinguishes between mkl and fftw
depends_on("fftw", when="+fftw")
depends_on("mkl", when="+mkl")
conflicts("+mkl", when="+fftw")

depends_on("fiat~mpi", when="~mpi")
depends_on("fiat+mpi", when="+mpi")
Expand Down
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/py-openpyxl/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class PyOpenpyxl(PythonPackage):
homepage = "https://openpyxl.readthedocs.org/"
pypi = "openpyxl/openpyxl-3.0.3.tar.gz"

version("3.0.7", sha256="6456a3b472e1ef0facb1129f3c6ef00713cebf62e736cd7a75bcc3247432f251")
version("3.0.3", sha256="547a9fc6aafcf44abe358b89ed4438d077e9d92e4f182c87e2dc294186dc4b64")
version("2.4.5", sha256="78c331e819fb0a63a1339d452ba0b575d1a31f09fdcce793a31bec7e9ef4ef21")
version("2.2.0", sha256="c34e3f7e3106dbe6d792f35d9a2f01c08fdd21a6fe582a2f540e39a70e7443c4")
Expand Down
3 changes: 3 additions & 0 deletions var/spack/repos/builtin/packages/py-pandas/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,7 @@ class PyPandas(PythonPackage):
# Optional dependencies
# https://pandas.pydata.org/pandas-docs/stable/getting_started/install.html#optional-dependencies

# https://github.com/spack/spack/issues/40452
depends_on("py-openpyxl@3.0.7:", type=("run"), when="@1.5.3:")

skip_modules = ["pandas.tests", "pandas.plotting._matplotlib", "pandas.core._numba.kernels"]