diff options
| author | ajw1980 <ajw1980@gmail.com> | 2019-03-26 15:05:40 -0500 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-03-26 15:05:39 -0500 |
| commit | 40121eddd984049f84f45479332b3932fe878e67 (patch) | |
| tree | 9042219cb5e6598dd41a1af6aa8f09f3955bbd4c | |
| parent | 9437cf88f003ef016bace3d28e5af29f02e5bc73 (diff) | |
| download | spack-40121eddd984049f84f45479332b3932fe878e67.tar.gz spack-40121eddd984049f84f45479332b3932fe878e67.tar.bz2 spack-40121eddd984049f84f45479332b3932fe878e67.tar.xz spack-40121eddd984049f84f45479332b3932fe878e67.zip | |
Py-jupyter package: dependency fixes (#10966)
* py-prompt-toolkit: Add newer version for required for newer
py-ipython versions
* py-ipykernel:
* Add newer py-ipykernel version
* Depend on py-setuptools so a python egg isn't attempted to be
built
* Update dependency for newer py-ipykernel versions
* py-jupyter-console: Remove py-prompt-toolkit dependency since it is
picked up in py-ipython
* py-ipython:
* Add missing py-backcall dependency
* Adjust py-prompt-toolkit dependencies for newer versions of
ipython
* py-jupyter-notebook: Require newer version of py-ipykernel since
jupyter is broken with previous versions
5 files changed, 11 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py index 83a041de74..499ae703ce 100644 --- a/var/spack/repos/builtin/packages/py-ipykernel/package.py +++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py @@ -12,6 +12,7 @@ class PyIpykernel(PythonPackage): homepage = "https://pypi.python.org/pypi/ipykernel" url = "https://github.com/ipython/ipykernel/archive/4.5.0.tar.gz" + version('5.1.0', sha256='30f01a2a1470d3fabbad03f5c43606c1bc2142850fc4ccedcf44281664ae9122') version('4.5.0', 'ea6aaf431b100452905aaca208edac72') version('4.4.1', 'c0033e524aa9e05ed18879641ffe6e0f') version('4.4.0', '8e626a1708ceff83412180d2ff2f3e57') @@ -24,8 +25,11 @@ class PyIpykernel(PythonPackage): version('4.1.0', '638a43e4f8a15872f749090c3f0827b6') depends_on('python@2.7:2.8,3.3:') + depends_on('py-setuptools', type='build') depends_on('py-traitlets@4.1.0:', type=('build', 'run')) - depends_on('py-tornado@4.0:', type=('build', 'run')) - depends_on('py-ipython@4.0:', type=('build', 'run')) + depends_on('py-tornado@4.0:', when='@:4.999', type=('build', 'run')) + depends_on('py-tornado@4.2:', when='@5.0.0:', type=('build', 'run')) + depends_on('py-ipython@4.0:', when='@:4.999', type=('build', 'run')) + depends_on('py-ipython@5.0:', when='@5.0.0:', type=('build', 'run')) depends_on('py-jupyter-client', type=('build', 'run')) depends_on('py-pexpect', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py index 10b2cd7e11..69331e0c68 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -26,10 +26,12 @@ class PyIpython(PythonPackage): depends_on('py-pygments', type=('build', 'run')) depends_on('py-pickleshare', type=('build', 'run')) depends_on('py-simplegeneric@0.8:', type=('build', 'run')) - depends_on('py-prompt-toolkit@1.0.4:1.999', type=('build', 'run')) + depends_on('py-prompt-toolkit@1.0.4:1.999', when='@:7.0.0', type=('build', 'run')) + depends_on('py-prompt-toolkit@2.0.0:2.999', when='@7.0.0:', type=('build', 'run')) depends_on('py-traitlets@4.2:', type=('build', 'run')) depends_on('py-decorator', type=('build', 'run')) depends_on('py-pexpect', type=('build', 'run')) + depends_on('py-backcall', type=('build', 'run'), when="^python@3.3:") depends_on('py-appnope', type=('build', 'run'), when=sys.platform == 'darwin' and diff --git a/var/spack/repos/builtin/packages/py-jupyter-console/package.py b/var/spack/repos/builtin/packages/py-jupyter-console/package.py index 792381a11a..fe66dc55e8 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-console/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-console/package.py @@ -24,4 +24,3 @@ class PyJupyterConsole(PythonPackage): depends_on('py-ipython', type=('build', 'run')) depends_on('py-ipykernel', type=('build', 'run')) depends_on('py-pygments', type=('build', 'run')) - depends_on('py-prompt-toolkit@1.0.0:1.999.999', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py index 7b6c52b7d2..45239772e8 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py @@ -38,5 +38,6 @@ class PyJupyterNotebook(PythonPackage): 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')) diff --git a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py index 447174cc56..1e8a04f5cd 100644 --- a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py +++ b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py @@ -12,6 +12,7 @@ class PyPromptToolkit(PythonPackage): homepage = "https://pypi.python.org/pypi/prompt_toolkit" url = "https://pypi.io/packages/source/p/prompt_toolkit/prompt_toolkit-1.0.9.tar.gz" + version('2.0.9', sha256='2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1') version('1.0.9', 'a39f91a54308fb7446b1a421c11f227c') depends_on('py-setuptools', type='build') |