summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kuhn <michael.kuhn@ovgu.de>2021-07-13 23:05:14 +0200
committerGitHub <noreply@github.com>2021-07-13 21:05:14 +0000
commitdf77922d22c9cc8c39601e0fc316799e8badc665 (patch)
tree4e424718b2eb78502d48e951559ec302be08b343
parent9a0febab8964514b7bbf97655e080b8863cec25e (diff)
downloadspack-df77922d22c9cc8c39601e0fc316799e8badc665.tar.gz
spack-df77922d22c9cc8c39601e0fc316799e8badc665.tar.bz2
spack-df77922d22c9cc8c39601e0fc316799e8badc665.tar.xz
spack-df77922d22c9cc8c39601e0fc316799e8badc665.zip
py-jupyterlab, py-jupyter-server: fix version range (#24864)
Using the original concretizer, trying to concretize py-jupyterlab fails with ``` ==> Error: Invalid Version range: 6.1.0:6.1 ``` because py-tornado does not have a 6.1.0 version but only a 6.1 one.
-rw-r--r--var/spack/repos/builtin/packages/py-jupyter-server/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-jupyterlab/package.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-jupyter-server/package.py b/var/spack/repos/builtin/packages/py-jupyter-server/package.py
index b63cd6ae39..3301cf8205 100644
--- a/var/spack/repos/builtin/packages/py-jupyter-server/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyter-server/package.py
@@ -19,7 +19,7 @@ class PyJupyterServer(PythonPackage):
depends_on('python@3.6:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
depends_on('py-jinja2', type=('build', 'run'))
- depends_on('py-tornado@6.1.0:', type=('build', 'run'))
+ depends_on('py-tornado@6.1:', type=('build', 'run'))
depends_on('py-pyzmq@17:', type=('build', 'run'))
depends_on('py-argon2-cffi', type=('build', 'run'))
depends_on('py-ipython-genutils', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-jupyterlab/package.py b/var/spack/repos/builtin/packages/py-jupyterlab/package.py
index e431f17693..2cd581cae3 100644
--- a/var/spack/repos/builtin/packages/py-jupyterlab/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyterlab/package.py
@@ -27,7 +27,7 @@ class PyJupyterlab(PythonPackage):
# @3:
depends_on('py-ipython', when='@3:', type=('build', 'run'))
depends_on('py-packaging', when='@3:', type=('build', 'run'))
- depends_on('py-tornado@6.1.0:', when='@3:', type=('build', 'run'))
+ depends_on('py-tornado@6.1:', when='@3:', type=('build', 'run'))
depends_on('py-jupyter-core', when='@3:', type=('build', 'run'))
depends_on('py-jupyterlab-server@2.3:2.999', when='@3.0.9:', type=('build', 'run'))
depends_on('py-jupyterlab-server@2.0:2.999', when='@3.0.0:3.0.8', type=('build', 'run'))