diff options
| author | iarspider <iarspider@gmail.com> | 2019-12-11 21:04:33 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-12-11 14:04:33 -0600 |
| commit | a254f7011eb9d48f3c5995d2794f9d014bffc834 (patch) | |
| tree | 8c934d4c4bebb7c59fe6f976beecad2e9d019fa0 /var | |
| parent | 34adebc7cf24d5ade731745149de3c423b8874b0 (diff) | |
| download | spack-a254f7011eb9d48f3c5995d2794f9d014bffc834.tar.gz spack-a254f7011eb9d48f3c5995d2794f9d014bffc834.tar.bz2 spack-a254f7011eb9d48f3c5995d2794f9d014bffc834.tar.xz spack-a254f7011eb9d48f3c5995d2794f9d014bffc834.zip | |
Fix py-notebook for Python2 (#14079)
* Fix py-notebook for Python2
* PEP-8 fix
* Update package.py
* Update package.py
* Syntax fix
* Update var/spack/repos/builtin/packages/py-notebook/package.py
Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-notebook/package.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/py-notebook/package.py b/var/spack/repos/builtin/packages/py-notebook/package.py index 04e78ea259..97542e89a7 100644 --- a/var/spack/repos/builtin/packages/py-notebook/package.py +++ b/var/spack/repos/builtin/packages/py-notebook/package.py @@ -13,6 +13,7 @@ class PyNotebook(PythonPackage): url = "https://pypi.io/packages/source/n/notebook/notebook-4.2.3.tar.gz" version('6.0.1', sha256='660976fe4fe45c7aa55e04bf4bccb9f9566749ff637e9020af3422f9921f9a5d') + version('5.7.8', sha256='573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8') version('4.2.3', sha256='39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851') version('4.2.2', sha256='418ba230c9b2e7e739940cae9fb4625e10a63f038e9c95cf1a9b7a244256ba38') version('4.2.1', sha256='a49de524dabb99f214bdf2a58f26c7892650251a23a3669c6492fb180492e197') @@ -24,26 +25,27 @@ class PyNotebook(PythonPackage): 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-setuptools', type='build', when='@5:') depends_on('py-jinja2', type=('build', 'run')) - depends_on('py-tornado@5.0:', type=('build', 'run')) + depends_on('py-tornado@4.0:6.999', type=('build', 'run'), when='@:5.7.4') + depends_on('py-tornado@4.1:6.999', type=('build', 'run'), when='@5.7.5:6.0.1') depends_on('py-ipython-genutils', type=('build', 'run')) depends_on('py-traitlets', type=('build', 'run')) + depends_on('py-traitlets@4.2.1:', type=('build', 'run'), when='@5:') depends_on('py-jupyter-core', type=('build', 'run')) + depends_on('py-jupyter-core@4.4.0:', type=('build', 'run'), when='@5.7.0:') depends_on('py-jupyter-client', type=('build', 'run')) + depends_on('py-jupyter-client@5.2.0:', type=('build', 'run'), when='@5.7.0:') 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-ipykernel@5.1.0:', when='@4.2.0: ^python@3.3:', type=('build', 'run')) + depends_on('py-ipykernel@:5.0.0', when='@4.2.0: ^python@:2.8', 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-prometheus-client', type=('build', 'run'), when='@5.7.0:') + depends_on('py-terminado@0.3.3:', type=('build', 'run'), when='@:5.7.0') + depends_on('py-terminado@0.8.1:', type=('build', 'run'), when='@5.7.0:') 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') + depends_on('py-ipaddress', type=('build', 'run'), when='@5.7.0: ^python@:2.8') |