diff options
| author | Andreas Baumbach <healther@users.noreply.github.com> | 2019-11-05 19:51:00 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-11-05 12:51:00 -0600 |
| commit | 74c81c0fc357197be96462ab70b0c927e05a0ea7 (patch) | |
| tree | 0c727e6eecbce0c957053be6cbba3a45fde3038b | |
| parent | 35f0003c08f9b28eb206668b585aa5d3a71e27b0 (diff) | |
| download | spack-74c81c0fc357197be96462ab70b0c927e05a0ea7.tar.gz spack-74c81c0fc357197be96462ab70b0c927e05a0ea7.tar.bz2 spack-74c81c0fc357197be96462ab70b0c927e05a0ea7.tar.xz spack-74c81c0fc357197be96462ab70b0c927e05a0ea7.zip | |
update py-notebook (#13423)
* update py-jupyter-notebook
* add setuptools dependency for newer version
the whole jupyter collection seems to use setuptools in case of
certain setup.py-arguments from the very beginning. However the latest
ones actually require it, otherwise the build will fail
* add newly introduced dependencies
* dependency constraints
* drop terminal variant and update python dep
| -rw-r--r-- | var/spack/repos/builtin/packages/py-notebook/package.py | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/py-notebook/package.py b/var/spack/repos/builtin/packages/py-notebook/package.py index 4eb62b3ac8..04e78ea259 100644 --- a/var/spack/repos/builtin/packages/py-notebook/package.py +++ b/var/spack/repos/builtin/packages/py-notebook/package.py @@ -12,6 +12,7 @@ class PyNotebook(PythonPackage): homepage = "https://github.com/jupyter/notebook" url = "https://pypi.io/packages/source/n/notebook/notebook-4.2.3.tar.gz" + version('6.0.1', sha256='660976fe4fe45c7aa55e04bf4bccb9f9566749ff637e9020af3422f9921f9a5d') version('4.2.3', sha256='39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851') version('4.2.2', sha256='418ba230c9b2e7e739940cae9fb4625e10a63f038e9c95cf1a9b7a244256ba38') version('4.2.1', sha256='a49de524dabb99f214bdf2a58f26c7892650251a23a3669c6492fb180492e197') @@ -21,19 +22,28 @@ class PyNotebook(PythonPackage): version('4.0.4', sha256='a57852514bce1b1cf41fa0311f6cf894960cf68b083b55e6c408316b598d5648') version('4.0.2', sha256='8478d7e2ab474855b0ff841f693983388af8662d3af1adcb861acb900274f22a') - variant('terminal', default=False, description="Enable terminal functionality") - - depends_on('python@2.7:2.8,3.3:') + depends_on('python@2.7:2.8,3.3:', type=('build', 'run')) + depends_on('python@3.5:', type=('build', 'run'), when='@6:') + depends_on('py-setuptools', type='build', when='@6:') depends_on('py-jinja2', type=('build', 'run')) - depends_on('py-tornado@4:', type=('build', 'run')) + depends_on('py-tornado@5.0:', type=('build', 'run')) depends_on('py-ipython-genutils', type=('build', 'run')) depends_on('py-traitlets', type=('build', 'run')) depends_on('py-jupyter-core', type=('build', 'run')) depends_on('py-jupyter-client', type=('build', 'run')) - depends_on('py-jupyter-console', type=('build', 'run')) depends_on('py-nbformat', type=('build', 'run')) depends_on('py-nbconvert', type=('build', 'run')) depends_on('py-ipykernel', type=('build', 'run')) depends_on('py-ipykernel@5.1.0:', when='@4.2.0:', type=('build', 'run')) - depends_on('py-terminado@0.3.3:', when="+terminal", type=('build', 'run')) depends_on('py-ipywidgets', when="+terminal", type=('build', 'run')) + # required for 6.0.1, not sure about 5.x.x, as there is no version in spack + # right now treat them as 6-or-newer dependencies + depends_on('py-prometheus-client', type=('build', 'run'), when='@6:') + depends_on('py-terminado', type=('build', 'run'), when='@6:') + depends_on('py-send2trash', type=('build', 'run'), when='@6:') + depends_on('py-pyzmq@17:', type=('build', 'run'), when='@6:') + depends_on('py-traitlets@4.2.1:', type=('build', 'run'), when='@6:') + depends_on('py-jupyter-core@4.4.0:', type=('build', 'run'), when='@6:') + depends_on('py-jupyter-client@5.3.1:', type=('build', 'run'), when='@6:') + depends_on('py-terminado@0.8.1:', type=('build', 'run'), when='@6:') + depends_on('py-ipaddress', type=('build', 'run'), when='@6: ^python@:2.8') |