From f3162a1077d8f9f5b22cf2c60ebbc463de4097a3 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 11 Oct 2023 15:33:40 -0600 Subject: [PATCH 01/15] Fix version incompatibilities of py-pandas and py-openpyxl --- var/spack/repos/builtin/packages/py-openpyxl/package.py | 1 + var/spack/repos/builtin/packages/py-pandas/package.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/var/spack/repos/builtin/packages/py-openpyxl/package.py b/var/spack/repos/builtin/packages/py-openpyxl/package.py index 4d81f372226767..2e2fbb9105c1b3 100644 --- a/var/spack/repos/builtin/packages/py-openpyxl/package.py +++ b/var/spack/repos/builtin/packages/py-openpyxl/package.py @@ -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") diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 1a46b9a9c66dd2..6abd9aab7c4f89 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -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"] From 229d56e9f216313fe21b39d60bbc02548dfa9134 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 11 Oct 2023 15:33:55 -0600 Subject: [PATCH 02/15] Fix fftw/mkl variants for ectrans --- var/spack/repos/builtin/packages/ectrans/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/ectrans/package.py b/var/spack/repos/builtin/packages/ectrans/package.py index 5bac4e53b4abb2..3b8f7417d5dca0 100644 --- a/var/spack/repos/builtin/packages/ectrans/package.py +++ b/var/spack/repos/builtin/packages/ectrans/package.py @@ -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") From 764f255d2d666052cc03e17e3ff96c6aa74efe82 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 13 Oct 2023 07:53:24 -0600 Subject: [PATCH 03/15] More robust approach to finding makeinfo side by side with info --- var/spack/repos/builtin/packages/texinfo/package.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index c5eada32cd15b9..052dee4b4db795 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import os import re from spack.package import * @@ -69,12 +70,12 @@ def setup_build_environment(self, env): @classmethod def determine_version(cls, exe): - # On CentOS and Ubuntu, the OS package texinfo installs "info", - # which satisfies spack external find, but "makeinfo" comes from - # texi2html and may not be installed (and vice versa). - info = which("info") - makeinfo = which("makeinfo") - if info is None or makeinfo is None: + # On CentOS and Ubuntu, the OS package info installs "info", + # which satisfies spack external find, but "makeinfo" comes + # from texinfo and may not be installed (and vice versa). + (texinfo_path, info_exe) = os.path.split(exe) + makeinfo_exe = os.path.join(texinfo_path, "makeinfo") + if not os.path.exists(makeinfo_exe): return None output = Executable(exe)("--version", output=str, error=str) match = re.search(r"info \(GNU texinfo\)\s+(\S+)", output) From d7f5ad0e60a9d68a16d8cae9fca2d79ccad8a1e6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 14 Oct 2023 12:44:24 -0600 Subject: [PATCH 04/15] Update var/spack/repos/builtin/packages/py-awscrt/package.py Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/py-awscrt/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/py-awscrt/package.py b/var/spack/repos/builtin/packages/py-awscrt/package.py index f7e65ccaad68e4..81428d4d4f63c0 100644 --- a/var/spack/repos/builtin/packages/py-awscrt/package.py +++ b/var/spack/repos/builtin/packages/py-awscrt/package.py @@ -16,7 +16,7 @@ class PyAwscrt(PythonPackage): version("0.16.16", sha256="13075df2c1d7942fe22327b6483274517ee0f6ae765c4e6b6ae9ef5b4c43a827") - depends_on("cmake", type=("build")) + depends_on("cmake@3.1:", type=("build")) depends_on("openssl", type=("build"), when="platform=linux") depends_on("py-setuptools", type=("build")) From aa22abbf3267783f61a27293d7839485df5fea88 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 11 Oct 2023 15:33:40 -0600 Subject: [PATCH 05/15] Fix version incompatibilities of py-pandas and py-openpyxl --- var/spack/repos/builtin/packages/py-pandas/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 6abd9aab7c4f89..5690d5f6497986 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -130,4 +130,10 @@ class PyPandas(PythonPackage): # https://github.com/spack/spack/issues/40452 depends_on("py-openpyxl@3.0.7:", type=("run"), when="@1.5.3:") + # Historical dependencies + depends_on("py-setuptools@61:", when="@2.0", type="build") + depends_on("py-setuptools@51:", when="@1.3.2:1", type="build") + depends_on("py-setuptools@38.6:", when="@1.3.0:1.3.1", type="build") + depends_on("py-setuptools@24.2:", when="@:1.2", type="build") + skip_modules = ["pandas.tests", "pandas.plotting._matplotlib", "pandas.core._numba.kernels"] From e24c41232553d161250ab1752e80327218499b28 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 13 Oct 2023 07:57:40 -0600 Subject: [PATCH 06/15] Add variant excel for py-pandas --- var/spack/repos/builtin/packages/py-pandas/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 5690d5f6497986..4bcbb631392cdb 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -17,6 +17,8 @@ class PyPandas(PythonPackage): maintainers("adamjstewart") + variant("excel", default=False, description="Build with support for Excel (py-openpyxl)") + version("2.0.3", sha256="c02f372a88e0d17f36d3093a644c73cfc1788e876a7c4bcb4020a77512e2043c") version("2.0.2", sha256="dd5476b6c3fe410ee95926873f377b856dbc4e81a9c605a0dc05aaccc6a7c6c6") version("2.0.1", sha256="19b8e5270da32b41ebf12f0e7165efa7024492e9513fb46fb631c5022ae5709d") @@ -128,7 +130,8 @@ class PyPandas(PythonPackage): # 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:") + depends_on("py-openpyxl", type=("run"), when="+excel") + depends_on("py-openpyxl@3.0.7:", type=("run"), when="@1.5.3: +excel") # Historical dependencies depends_on("py-setuptools@61:", when="@2.0", type="build") From 6d3fa7f7247a4f83e267bc641cd58ea4cd8be80d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 14 Oct 2023 19:21:40 -0600 Subject: [PATCH 07/15] Add package py-pyxlsb --- .../builtin/packages/py-pyxlsb/package.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pyxlsb/package.py diff --git a/var/spack/repos/builtin/packages/py-pyxlsb/package.py b/var/spack/repos/builtin/packages/py-pyxlsb/package.py new file mode 100644 index 00000000000000..d873e0b68b0533 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyxlsb/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class PyPyxlsb(PythonPackage): + """Excel 2007-2010 Binary Workbook (xlsb) parser""" + + pypi = "pyxlsb/pyxlsb-1.0.10.tar.gz" + + version("1.0.10", sha256="8062d1ea8626d3f1980e8b1cfe91a4483747449242ecb61013bc2df85435f685") + version("1.0.8", sha256="dcf26d6494b45d8852d68571f828c2361b74711a2e19ba03eee77f96b9210464") + version("1.0.6", sha256="47e8230582de15ad9824a456d1d4cb36a6535f4ad5e5eb2464d31f0445b9db46") + + depends_on("py-setuptools", type="build") From 83335d59edfcf485c070950bc2cfdfd95a0cdfb2 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 14 Oct 2023 19:21:52 -0600 Subject: [PATCH 08/15] Add versios for py-xlsxwriter --- var/spack/repos/builtin/packages/py-xlsxwriter/package.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py index af333f03c08615..09c2285311cd76 100644 --- a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py +++ b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py @@ -12,6 +12,10 @@ class PyXlsxwriter(PythonPackage): pypi = "XlsxWriter/XlsxWriter-1.0.2.tar.gz" + version("3.1.7", sha256="353042efb0f8551ce72baa087e98228f3394fcb380e8b96313edf1eec8d50823") + version("3.0.3", sha256="e89f4a1d2fa2c9ea15cde77de95cd3fd8b0345d0efb3964623f395c8c4988b7f") + version("1.4.3", sha256="641db6e7b4f4982fd407a3f372f45b878766098250d26963e95e50121168cbe2") + version("1.2.2", sha256="5a5e2195a4672d17db79839bbdf1006a521adb57eaceea1c335ae4b3d19f088f") version("1.0.2", sha256="a26bbbafff88abffce592ffd5dfaa4c9f08dc44ef4afbf45c70d3e270325f856") depends_on("py-setuptools", type="build") From 4d69864882deb5af0c5cf7804a0c07f9bd0200ca Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 14 Oct 2023 19:22:12 -0600 Subject: [PATCH 09/15] Define excel dependencies for py-pandas 1.4, 1.5, 2.0, 2.1 --- .../repos/builtin/packages/py-pandas/package.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 4bcbb631392cdb..85e4f4fb0e77c2 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -17,7 +17,7 @@ class PyPandas(PythonPackage): maintainers("adamjstewart") - variant("excel", default=False, description="Build with support for Excel (py-openpyxl)") + variant("excel", when="@1.5:", default=False, description="Build with support for Excel (py-openpyxl)") version("2.0.3", sha256="c02f372a88e0d17f36d3093a644c73cfc1788e876a7c4bcb4020a77512e2043c") version("2.0.2", sha256="dd5476b6c3fe410ee95926873f377b856dbc4e81a9c605a0dc05aaccc6a7c6c6") @@ -129,9 +129,18 @@ 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", type=("run"), when="+excel") - depends_on("py-openpyxl@3.0.7:", type=("run"), when="@1.5.3: +excel") + # Excel dependencies for 1.4+ (not coded up for earlier versions) + depends_on("py-xlrd@2.0.1:", type=("run"), when="@1.4: +excel") + depends_on("py-xlwt@1.3.0:", type=("run"), when="@1.4:1.5 +excel") + depends_on("py-xlsxwriter@1.2.2:", type=("run"), when="@1.4: +excel") + depends_on("py-xlsxwriter@1.4.3:", type=("run"), when="@1.5: +excel") + depends_on("py-xlsxwriter@3.0.3:", type=("run"), when="@2.1: +excel") + depends_on("py-openpyxl@3.0.3:", type=("run"), when="@1.4: +excel") + depends_on("py-openpyxl@3.0.7:", type=("run"), when="@1.5: +excel") + depends_on("py-openpyxl@3.0.10:", type=("run"), when="@2.1: +excel") + depends_on("py-pyxlsb@1.0.6:", type=("run"), when="@1.4: +excel") + depends_on("py-pyxlsb@1.0.8:", type=("run"), when="@1.5: +excel") + depends_on("py-pyxlsb@1.0.9:", type=("run"), when="@2.1: +excel") # Historical dependencies depends_on("py-setuptools@61:", when="@2.0", type="build") From 6e2eef4be11c74016897edf0d0d0ea6e54213718 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 14 Oct 2023 19:26:51 -0600 Subject: [PATCH 10/15] Fix variant excel in py-pandas --- var/spack/repos/builtin/packages/py-pandas/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 85e4f4fb0e77c2..0bf85e0ffd97ad 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -17,7 +17,7 @@ class PyPandas(PythonPackage): maintainers("adamjstewart") - variant("excel", when="@1.5:", default=False, description="Build with support for Excel (py-openpyxl)") + variant("excel", when="@1.4:", default=False, description="Build with support for Excel") version("2.0.3", sha256="c02f372a88e0d17f36d3093a644c73cfc1788e876a7c4bcb4020a77512e2043c") version("2.0.2", sha256="dd5476b6c3fe410ee95926873f377b856dbc4e81a9c605a0dc05aaccc6a7c6c6") From bf5d1e967f66a3df6a8e670bc39a29b0fe17386f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sun, 15 Oct 2023 20:05:24 -0600 Subject: [PATCH 11/15] Add package py-odfpy, which is also a dependency for py-pandas@2.0: --- .../repos/builtin/packages/py-odfpy/package.py | 18 ++++++++++++++++++ .../builtin/packages/py-pandas/package.py | 1 + 2 files changed, 19 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-odfpy/package.py diff --git a/var/spack/repos/builtin/packages/py-odfpy/package.py b/var/spack/repos/builtin/packages/py-odfpy/package.py new file mode 100644 index 00000000000000..6f49d1b4a11129 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-odfpy/package.py @@ -0,0 +1,18 @@ +# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyOdfpy(PythonPackage): + """Odfpy is a library to read and write OpenDocument v. 1.2 files.""" + + homepage = "https://github.com/eea/odfpy" + url = "https://github.com/eea/odfpy/archive/release-1.4.1.tar.gz" + + version("1.4.1", sha256="9f97e4c808f656ce22739eec43a7c1741f645b7decef37d4fb048edb33e8caad") + + depends_on("py-setuptools", type="build") + depends_on("py-defusedxml", type=("build", "run")) \ No newline at end of file diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 0bf85e0ffd97ad..3358d764a8f36b 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -141,6 +141,7 @@ class PyPandas(PythonPackage): depends_on("py-pyxlsb@1.0.6:", type=("run"), when="@1.4: +excel") depends_on("py-pyxlsb@1.0.8:", type=("run"), when="@1.5: +excel") depends_on("py-pyxlsb@1.0.9:", type=("run"), when="@2.1: +excel") + depends_on("py-odfpy@1.4.1:", type=("run"), when="@2.0: +excel") # Historical dependencies depends_on("py-setuptools@61:", when="@2.0", type="build") From 0e4ca8a41cb3ef30c2acd381e5af49bd0e1471d1 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sun, 15 Oct 2023 20:57:09 -0600 Subject: [PATCH 12/15] Rearrange excel dependencies for py-pandas --- .../builtin/packages/py-pandas/package.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 3358d764a8f36b..224af947aa177c 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -130,18 +130,18 @@ class PyPandas(PythonPackage): # https://pandas.pydata.org/pandas-docs/stable/getting_started/install.html#optional-dependencies # Excel dependencies for 1.4+ (not coded up for earlier versions) + depends_on("py-odfpy@1.4.1:", type=("run"), when="@2.0: +excel") + depends_on("py-openpyxl@3.0.10:", type=("run"), when="@2.1: +excel") + depends_on("py-openpyxl@3.0.7:", type=("run"), when="@1.5: +excel") + depends_on("py-openpyxl@3.0.3:", type=("run"), when="@1.4: +excel") + depends_on("py-pyxlsb@1.0.9:", type=("run"), when="@2.1: +excel") + depends_on("py-pyxlsb@1.0.8:", type=("run"), when="@1.5: +excel") + depends_on("py-pyxlsb@1.0.6:", type=("run"), when="@1.4: +excel") depends_on("py-xlrd@2.0.1:", type=("run"), when="@1.4: +excel") depends_on("py-xlwt@1.3.0:", type=("run"), when="@1.4:1.5 +excel") - depends_on("py-xlsxwriter@1.2.2:", type=("run"), when="@1.4: +excel") - depends_on("py-xlsxwriter@1.4.3:", type=("run"), when="@1.5: +excel") depends_on("py-xlsxwriter@3.0.3:", type=("run"), when="@2.1: +excel") - depends_on("py-openpyxl@3.0.3:", type=("run"), when="@1.4: +excel") - depends_on("py-openpyxl@3.0.7:", type=("run"), when="@1.5: +excel") - depends_on("py-openpyxl@3.0.10:", type=("run"), when="@2.1: +excel") - depends_on("py-pyxlsb@1.0.6:", type=("run"), when="@1.4: +excel") - depends_on("py-pyxlsb@1.0.8:", type=("run"), when="@1.5: +excel") - depends_on("py-pyxlsb@1.0.9:", type=("run"), when="@2.1: +excel") - depends_on("py-odfpy@1.4.1:", type=("run"), when="@2.0: +excel") + depends_on("py-xlsxwriter@1.4.3:", type=("run"), when="@1.5: +excel") + depends_on("py-xlsxwriter@1.2.2:", type=("run"), when="@1.4: +excel") # Historical dependencies depends_on("py-setuptools@61:", when="@2.0", type="build") From 4d8c7c698427cb5eb57dd461d8fc78974873223f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 16 Oct 2023 06:54:53 -0600 Subject: [PATCH 13/15] Change url to pypi --- var/spack/repos/builtin/packages/py-odfpy/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-odfpy/package.py b/var/spack/repos/builtin/packages/py-odfpy/package.py index 6f49d1b4a11129..2bff9733b5523e 100644 --- a/var/spack/repos/builtin/packages/py-odfpy/package.py +++ b/var/spack/repos/builtin/packages/py-odfpy/package.py @@ -10,9 +10,9 @@ class PyOdfpy(PythonPackage): """Odfpy is a library to read and write OpenDocument v. 1.2 files.""" homepage = "https://github.com/eea/odfpy" - url = "https://github.com/eea/odfpy/archive/release-1.4.1.tar.gz" + pypi = "odfpy/odfpy-1.4.1.tar.gz" - version("1.4.1", sha256="9f97e4c808f656ce22739eec43a7c1741f645b7decef37d4fb048edb33e8caad") + version("1.4.1", sha256="db766a6e59c5103212f3cc92ec8dd50a0f3a02790233ed0b52148b70d3c438ec") depends_on("py-setuptools", type="build") depends_on("py-defusedxml", type=("build", "run")) \ No newline at end of file From 101b795843980c6b7143b2618d7bc9670d9ab2ed Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 16 Oct 2023 06:58:30 -0600 Subject: [PATCH 14/15] Add missing newline to fix style in py-odfpy --- var/spack/repos/builtin/packages/py-odfpy/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/py-odfpy/package.py b/var/spack/repos/builtin/packages/py-odfpy/package.py index 2bff9733b5523e..338fb3beab4bd3 100644 --- a/var/spack/repos/builtin/packages/py-odfpy/package.py +++ b/var/spack/repos/builtin/packages/py-odfpy/package.py @@ -15,4 +15,4 @@ class PyOdfpy(PythonPackage): version("1.4.1", sha256="db766a6e59c5103212f3cc92ec8dd50a0f3a02790233ed0b52148b70d3c438ec") depends_on("py-setuptools", type="build") - depends_on("py-defusedxml", type=("build", "run")) \ No newline at end of file + depends_on("py-defusedxml", type=("build", "run")) From 9336e54a8daf322fbf7955587b2e5b2385eb9788 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 16 Oct 2023 15:42:04 -0600 Subject: [PATCH 15/15] Add variant +excel to py-pandas dependency in jedi-tools-env --- .../repos/jcsda-emc-bundles/packages/jedi-tools-env/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/jcsda-emc-bundles/packages/jedi-tools-env/package.py b/var/spack/repos/jcsda-emc-bundles/packages/jedi-tools-env/package.py index a373bbe3ce144d..5e0ac15789c151 100644 --- a/var/spack/repos/jcsda-emc-bundles/packages/jedi-tools-env/package.py +++ b/var/spack/repos/jcsda-emc-bundles/packages/jedi-tools-env/package.py @@ -25,7 +25,7 @@ class JediToolsEnv(BundlePackage): # depends_on("aws-parallelcluster", type="run") depends_on("py-click", type="run") depends_on("py-openpyxl", type="run") - depends_on("py-pandas", type="run") + depends_on("py-pandas +excel", type="run") depends_on("py-pygithub", type="run") depends_on("py-scipy", type="run") depends_on("py-sphinx", type="run")