Merge pull request #346 from climbfuji/feature/merge_openpyxl_etc_fro…

…m_release_151

Merge py-pandas, py-awscrt, texinfo, and ectrans bug fixes from release/1.5.1 (with mods from spack develop)

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")

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"))
 

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"
+    pypi = "odfpy/odfpy-1.4.1.tar.gz"
+
+    version("1.4.1", sha256="db766a6e59c5103212f3cc92ec8dd50a0f3a02790233ed0b52148b70d3c438ec")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-defusedxml", type=("build", "run"))

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")

var/spack/repos/builtin/packages/py-pandas/package.py

@@ -17,6 +17,8 @@ class PyPandas(PythonPackage):
 
     maintainers("adamjstewart")
 
+    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")
     version("2.0.1", sha256="19b8e5270da32b41ebf12f0e7165efa7024492e9513fb46fb631c5022ae5709d")
@@ -127,4 +129,24 @@ class PyPandas(PythonPackage):
     # Optional dependencies
     # 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("[email protected]:", type=("run"), when="@2.0: +excel")
+    depends_on("[email protected]:", type=("run"), when="@2.1: +excel")
+    depends_on("[email protected]:", type=("run"), when="@1.5: +excel")
+    depends_on("[email protected]:", type=("run"), when="@1.4: +excel")
+    depends_on("[email protected]:", type=("run"), when="@2.1: +excel")
+    depends_on("[email protected]:", type=("run"), when="@1.5: +excel")
+    depends_on("[email protected]:", type=("run"), when="@1.4: +excel")
+    depends_on("[email protected]:", type=("run"), when="@1.4: +excel")
+    depends_on("[email protected]:", type=("run"), when="@1.4:1.5 +excel")
+    depends_on("[email protected]:", type=("run"), when="@2.1: +excel")
+    depends_on("[email protected]:", type=("run"), when="@1.5: +excel")
+    depends_on("[email protected]:", type=("run"), when="@1.4: +excel")
+
+    # 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("[email protected]:", when="@1.3.0:1.3.1", type="build")
+    depends_on("[email protected]:", when="@:1.2", type="build")
+
     skip_modules = ["pandas.tests", "pandas.plotting._matplotlib", "pandas.core._numba.kernels"]

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")

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")

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)

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")