diff options
author | Adam J. Stewart <ajstewart426@gmail.com> | 2024-10-31 16:28:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-31 09:28:59 -0600 |
commit | ffde309a99a3a603cc6182ee820324f5e44f7b9d (patch) | |
tree | 2dfe424ee7773282fd5d6d6926097abdc9ddef3b | |
parent | a08b4ae53838afc6e7b57b99b299daf2cfeca997 (diff) | |
download | spack-ffde309a99a3a603cc6182ee820324f5e44f7b9d.tar.gz spack-ffde309a99a3a603cc6182ee820324f5e44f7b9d.tar.bz2 spack-ffde309a99a3a603cc6182ee820324f5e44f7b9d.tar.xz spack-ffde309a99a3a603cc6182ee820324f5e44f7b9d.zip |
py-ipympl: add v0.9.4 (#47193)
* py-ipympl: add v0.9.4
* Add node/npm dependencies at runtime
* node-js: fix build with older GCC
* Change CLANG flags too
* Add supported compiler versions
* Deprecate older version
5 files changed, 50 insertions, 13 deletions
diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index e0111dd673..8850255deb 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -79,6 +79,15 @@ class NodeJs(Package): depends_on("openssl@1.1:", when="+openssl") depends_on("zlib-api", when="+zlib") + # https://github.com/nodejs/node/blob/main/BUILDING.md#supported-toolchains + conflicts("%gcc@:12.1", when="@23:") + conflicts("%gcc@:10.0", when="@20:") + conflicts("%gcc@:8.2", when="@16:") + conflicts("%gcc@:6.2", when="@12:") + conflicts("%apple-clang@:11", when="@21:") + conflicts("%apple-clang@:10", when="@16:") + conflicts("%apple-clang@:9", when="@13:") + phases = ["configure", "build", "install"] # https://github.com/spack/spack/issues/19310 diff --git a/var/spack/repos/builtin/packages/py-hatch-jupyter-builder/package.py b/var/spack/repos/builtin/packages/py-hatch-jupyter-builder/package.py index 0bd62053a1..47d97c4d18 100644 --- a/var/spack/repos/builtin/packages/py-hatch-jupyter-builder/package.py +++ b/var/spack/repos/builtin/packages/py-hatch-jupyter-builder/package.py @@ -16,5 +16,7 @@ class PyHatchJupyterBuilder(PythonPackage): version("0.8.3", sha256="0dbd14a8aef6636764f88a8fd1fcc9a91921e5c50356e6aab251782f264ae960") + depends_on("npm", type="run") + depends_on("python@3.8:", type=("build", "run")) depends_on("py-hatchling@1.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hatch-nodejs-version/package.py b/var/spack/repos/builtin/packages/py-hatch-nodejs-version/package.py index 5648c0c247..09f2be4283 100644 --- a/var/spack/repos/builtin/packages/py-hatch-nodejs-version/package.py +++ b/var/spack/repos/builtin/packages/py-hatch-nodejs-version/package.py @@ -14,6 +14,7 @@ class PyHatchNodejsVersion(PythonPackage): license("MIT") + version("0.3.2", sha256="8a7828d817b71e50bbbbb01c9bfc0b329657b7900c56846489b9c958de15b54c") version("0.3.1", sha256="0e55fd713d92c5c1ccfee778efecaa780fd8bcd276d4ca7aff9f6791f6f76d9c") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ipympl/package.py b/var/spack/repos/builtin/packages/py-ipympl/package.py index c83d6392b0..a45799610d 100644 --- a/var/spack/repos/builtin/packages/py-ipympl/package.py +++ b/var/spack/repos/builtin/packages/py-ipympl/package.py @@ -15,16 +15,37 @@ class PyIpympl(PythonPackage): license("BSD-3-Clause") - version("0.8.8", sha256="5bf5d780b07fafe7924922ac6b2f3abd22721f341e5e196b3b82737dfbd0e1c9") - - depends_on("py-setuptools@40.8:", type="build") - depends_on("py-ipython@:8", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) - depends_on("py-ipython-genutils", type=("build", "run")) - depends_on("pil", type=("build", "run")) - depends_on("py-traitlets@:5", type=("build", "run")) - depends_on("py-ipywidgets@7.6:7", type=("build", "run")) - depends_on("py-matplotlib@2:3", type=("build", "run")) - depends_on("py-jupyter-packaging@0.7", type="build") - depends_on("py-jupyterlab@3", type="build") - depends_on("yarn", type="build") + version("0.9.4", sha256="cfb53c5b4fcbcee6d18f095eecfc6c6c474303d5b744e72cc66e7a2804708907") + # Build failures + version( + "0.8.8", + sha256="5bf5d780b07fafe7924922ac6b2f3abd22721f341e5e196b3b82737dfbd0e1c9", + deprecated=True, + ) + + with default_args(type="build"): + with when("@0.9:"): + depends_on("py-hatchling") + depends_on("py-jupyterlab@4") + depends_on("py-hatch-nodejs-version@0.3.2:") + + # Historical dependencies + with when("@:0.8"): + depends_on("py-jupyter-packaging@0.7") + depends_on("py-jupyterlab@3") + depends_on("py-setuptools@40.8:") + depends_on("yarn") + + with default_args(type=("build", "run")): + depends_on("py-ipython@:8") + depends_on("py-ipython-genutils") + depends_on("py-ipywidgets@7.6:8", when="@0.9:") + depends_on("py-ipywidgets@7.6:7", when="@:0.8") + depends_on("py-matplotlib@3.4:3", when="@0.9:") + depends_on("py-matplotlib@2:3", when="@:0.8") + depends_on("py-numpy") + depends_on("pil") + depends_on("py-traitlets@:5") + + # Necessary for jupyter extension env vars + depends_on("py-jupyter-core") diff --git a/var/spack/repos/builtin/packages/py-jupyterlab/package.py b/var/spack/repos/builtin/packages/py-jupyterlab/package.py index 08c57c99a9..195ee27e29 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab/package.py @@ -29,6 +29,10 @@ class PyJupyterlab(PythonPackage): version("2.2.7", sha256="a72ffd0d919cba03a5ef8422bc92c3332a957ff97b0490494209c83ad93826da") version("2.1.0", sha256="8c239aababf5baa0b3d36e375fddeb9fd96f3a9a24a8cda098d6a414f5bbdc81") + # Optional dependencies needed to install jupyterlab extensions + depends_on("node-js", type="run") + depends_on("npm", type="run") + depends_on("python@3.8:", when="@4:", type=("build", "run")) depends_on("py-hatchling@1.5:", when="@4:", type=("build", "run")) # under [tool.hatch.build.hooks.jupyter-builder] in pyproject.toml |