zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Py-jupyter package: dependency fixes (#10966)

Browse Source 
* 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
This commit is contained in:
ajw1980 2019-03-26 15:05:40 -05:00 committed by Peter Scheibel
parent 9437cf88f0
commit 40121eddd9
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/py-ipykernel/package.py
View File

@ -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'))

4
var/spack/repos/builtin/packages/py-ipython/package.py
View File

@ -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

1
var/spack/repos/builtin/packages/py-jupyter-console/package.py
View File

@ -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'))

1
var/spack/repos/builtin/packages/py-jupyter-notebook/package.py
View File

@ -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'))

1
var/spack/repos/builtin/packages/py-prompt-toolkit/package.py
View File

@ -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')