diff options
3 files changed, 29 insertions, 17 deletions
diff --git a/var/spack/repos/builtin/packages/py-ipywidgets/package.py b/var/spack/repos/builtin/packages/py-ipywidgets/package.py index f728d54f75..5925eef0c4 100644 --- a/var/spack/repos/builtin/packages/py-ipywidgets/package.py +++ b/var/spack/repos/builtin/packages/py-ipywidgets/package.py @@ -12,6 +12,7 @@ class PyIpywidgets(PythonPackage): homepage = "https://github.com/ipython/ipywidgets" pypi = "ipywidgets/ipywidgets-7.6.5.tar.gz" + version("8.0.2", sha256="08cb75c6e0a96836147cbfdc55580ae04d13e05d26ffbc377b4e1c68baa28b1f") version("7.7.0", sha256="ab4a5596855a88b83761921c768707d65e5847068139bc1729ddfe834703542a") version("7.6.5", sha256="00974f7cb4d5f8d494c19810fedb9fa9b64bffd3cda7c2be23c133a1ad3c99c5") version("7.6.3", sha256="9f1a43e620530f9e570e4a493677d25f08310118d315b00e25a18f12913c41f0") @@ -20,18 +21,23 @@ class PyIpywidgets(PythonPackage): version("5.2.2", sha256="baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2") depends_on("python@2.7:2.8,3.3:", type=("build", "run")) + depends_on("python@3.7:", when="@8.0.2:", type=("build", "run")) # pip silently replaces distutils with setuptools depends_on("py-setuptools", type="build") + depends_on("py-setuptools@40.8.0:", when="@8.0.2:", type="build") depends_on("py-ipython@4:", type=("build", "run")) - depends_on("py-ipython@4:5", type=("build", "run"), when="^python@:3.2") - depends_on("py-jupyterlab-widgets@1.0.0:", type=("build", "run"), when="^python@3.6:") + depends_on("py-ipython@4:5", when="^python@:3.2", type=("build", "run")) + depends_on("py-ipython@6.1.0:", when="@8.0.2:", type=("build", "run")) depends_on("py-ipykernel@4.2.2:", type=("build", "run")) - depends_on("py-ipykernel@4.5.1:", type=("build", "run"), when="@6:") - depends_on("py-ipython-genutils@0.2.0:0.2", type=("build", "run"), when="@7.6.4:") + depends_on("py-ipykernel@4.5.1:", when="@6:", type=("build", "run")) depends_on("py-traitlets@4.2.1:", type=("build", "run")) - depends_on("py-traitlets@4.3.1:", type=("build", "run"), when="@6:") - depends_on("py-nbformat@4.2.0:", type=("build", "run"), when="@6:") - depends_on("py-widgetsnbextension@1.2.6:1.9", type=("build", "run"), when="@5.2.2") - depends_on("py-widgetsnbextension@3.4.0:3.4", type=("build", "run"), when="@7.4.2") - depends_on("py-widgetsnbextension@3.5.0:3.5", type=("build", "run"), when="@7.5.1:7.6.5") - depends_on("py-widgetsnbextension@3.6", type=("build", "run"), when="@7.7:") + depends_on("py-traitlets@4.3.1:", when="@6:", type=("build", "run")) + depends_on("py-widgetsnbextension@1.2.6:1.9", when="@5.2.2", type=("build", "run")) + depends_on("py-widgetsnbextension@3.4.0:3.4", when="@7.4.2", type=("build", "run")) + depends_on("py-widgetsnbextension@3.5.0:3.5", when="@7.5.1:7.6.5", type=("build", "run")) + depends_on("py-widgetsnbextension@3.6", when="@7.7:7", type=("build", "run")) + depends_on("py-widgetsnbextension@4.0:4", when="@8.0.2:", type=("build", "run")) + depends_on("py-jupyterlab-widgets@1.0.0:", when="@:7 ^python@3.6:", type=("build", "run")) + depends_on("py-jupyterlab-widgets@3.0:3", when="@8.0.2:", type=("build", "run")) + depends_on("py-ipython-genutils@0.2.0:0.2", when="@7.6.4:7", type=("build", "run")) + depends_on("py-nbformat@4.2.0:", when="@6:7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py index fb7656c800..3aa086e126 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py @@ -15,6 +15,11 @@ class PyJupyterlabWidgets(PythonPackage): url = "https://files.pythonhosted.org/packages/py3/j/jupyterlab_widgets/jupyterlab_widgets-1.0.2-py3-none-any.whl" version( + "3.0.3", + sha256="6aa1bc0045470d54d76b9c0b7609a8f8f0087573bae25700a370c11f82cb38c8", + expand=False, + ) + version( "1.1.0", sha256="c2a9bd3789f120f64d73268c066ed3b000c56bc1dda217be5cdc43e7b4ebad3f", expand=False, @@ -26,8 +31,4 @@ class PyJupyterlabWidgets(PythonPackage): ) depends_on("python@3.6:", type=("build", "run")) - depends_on("py-setuptools@40.8.0:", type="build") - # TODO: replace this after concretizer learns how to concretize separate build deps - depends_on("py-jupyter-packaging7", type="build") - # depends_on('py-jupyter-packaging@0.7.9:0.7', type='build') - depends_on("py-jupyterlab@3.0:3", type="build") + depends_on("python@3.7:", when="@3.0.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py index 3ee2334825..0f84d566c4 100644 --- a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py +++ b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py @@ -11,6 +11,7 @@ class PyWidgetsnbextension(PythonPackage): pypi = "widgetsnbextension/widgetsnbextension-1.2.6.tar.gz" + version("4.0.3", sha256="34824864c062b0b3030ad78210db5ae6a3960dfb61d5b27562d6631774de0286") version("3.6.0", sha256="e84a7a9fcb9baf3d57106e184a7389a8f8eb935bf741a5eb9d60aa18cc029a80") version("3.5.1", sha256="079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7") version("3.4.2", sha256="fa618be8435447a017fd1bf2c7ae922d0428056cfc7449f7a8641edf76b48265") @@ -19,6 +20,10 @@ class PyWidgetsnbextension(PythonPackage): version("1.2.6", sha256="c618cfb32978c9517caf0b4ef3aec312f8dd138577745e7b0d4abfcc7315ce51") depends_on("py-setuptools", type="build") + # TODO: replace this after concretizer learns how to concretize separate build deps + depends_on("py-jupyter-packaging11", when="@4.0.3:", type="build") + depends_on("python@2.7:2.8,3.3:", type=("build", "run")) - depends_on("py-notebook@4.2.0:", type=("build", "run")) - depends_on("py-notebook@4.4.1:", type=("build", "run"), when="@3.3.0:") + depends_on("python@3.7:", when="@4.0.3:", type=("build", "run")) + depends_on("py-notebook@4.2.0:", when="@1.2.6", type=("build", "run")) + depends_on("py-notebook@4.4.1:", type=("build", "run"), when="@3.3.0:3") |