From 2cdc758860758112837e7d1973a54d731e920531 Mon Sep 17 00:00:00 2001 From: iarspider Date: Fri, 26 Nov 2021 01:58:43 +0100 Subject: [PATCH] Fix version constraint in py-ipykernel (#27665) * Fix version constrains in py-ipykernel and py-ipython Before the fix: ``` $ spack spec py-ipykernel@6.4.1 ^py-jupyter-client@7.0.6 ==> Error: py-ipykernel@6.4.1 ^py-jupyter-client@7.0.6 is unsatisfiable, conflicts are: no version satisfies the given constraints ``` After the fix: ``` ``` (thanks god the old concretizer is still there - it provides sane error messages!) * Fix py-ipython recipe * Revert "Fix py-ipython recipe" This reverts commit d65071665f002fa20721c3d87ae25354bec06ec5. --- var/spack/repos/builtin/packages/py-ipykernel/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py index 0b28559d16..3d2fbfd5a1 100644 --- a/var/spack/repos/builtin/packages/py-ipykernel/package.py +++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py @@ -47,7 +47,7 @@ class PyIpykernel(PythonPackage): depends_on('py-traitlets@4.1.0:', type=('build', 'run')) depends_on('py-traitlets@4.1.0:5', when='@6:', type=('build', 'run')) depends_on('py-jupyter-client', type=('build', 'run')) - depends_on('py-jupyter-client@:6', when='@6.0.2:', type=('build', 'run')) + depends_on('py-jupyter-client@:6', when='@6.0.2:6.1', type=('build', 'run')) depends_on('py-jupyter-client@:7', when='@6.2:', type=('build', 'run')) depends_on('py-tornado@4.0:', when='@:4', type=('build', 'run')) depends_on('py-tornado@4.2:', when='@5', type=('build', 'run'))