Fixups for jupyter (#15136)
* Fixups for jupyter This PR fixes a few things for some jupyter related packages. py-ipython: - make the python depends_on statements reflect needs of different versions - remove an unneeded conflicts directive py-ipywidgets: - add new version - set version constraints for py-widgetsnbextension py-jupyter-console - add new version - set python dependencies for versions as needed - set version constraint for py-ipython - set version constraints for py-prompt-toolkit py-pyqt5 - build with py-sip py-qtconsole - add dependency on py-pyqt5 * Update var/spack/repos/builtin/packages/py-jupyter-console/package.py Tweak version ranges. Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com> * Update var/spack/repos/builtin/packages/py-jupyter-console/package.py Tweak version range. Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com> * Make py-pyqt5 a run dependency Also, make formatting more consistent. * Fix site_packages_dir Change reference of site_packages_dir to self.site_packages_dir. Oddly, this did not show up as a problem until I regenerated the module. * Restore py-pyqt5 to previous state * Explicitly set path to site_packages_dir This change prevents an error when regenerating the py-pyqt5 module file. * Fix flake8 errors * Make sure prefix is in join_path * Fix flake8 errors Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
Glenn Johnson
GitHub
parent
1616aa7119
commit
8ee7ee6105
5 changed files with 25 additions and 8 deletions
|
|
@ -18,7 +18,8 @@ class PyIpython(PythonPackage):
|
|||
version('3.1.0', sha256='532092d3f06f82b1d8d1e5c37097eae19fcf025f8f6a4b670dd49c3c338d5624')
|
||||
version('2.3.1', sha256='3e98466aa2fe54540bcba9aa6e01a39f40110d67668c297340c4b9514b7cc49c')
|
||||
|
||||
depends_on('python@2.7:2.8,3.3:')
|
||||
depends_on('python@2.7:2.8,3.3:', type=('build', 'run'), when='@:6')
|
||||
depends_on('python@3.5:', type=('build', 'run'), when='@7:')
|
||||
|
||||
depends_on('py-backports-shutil-get-terminal-size', type=('build', 'run'), when="^python@:3.2")
|
||||
depends_on('py-pathlib2', type=('build', 'run'), when="^python@:3.3")
|
||||
|
|
@ -32,5 +33,3 @@ class PyIpython(PythonPackage):
|
|||
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='platform=darwin')
|
||||
|
||||
conflicts('^python@2.7:2.8', when='@7.0.0:')
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ class PyIpywidgets(PythonPackage):
|
|||
homepage = "https://github.com/ipython/ipywidgets"
|
||||
url = "https://github.com/ipython/ipywidgets/archive/5.2.2.tar.gz"
|
||||
|
||||
version('7.5.1', sha256='e4253384886aabbaf10966916a2cf9ffa72551bd045d536fa2a379f14b50cec3')
|
||||
version('7.4.2', sha256='f156165e8a855ed862fdf48e72700bdcd6956d089a2018c5b36d358255d45b2b')
|
||||
version('5.2.2', sha256='d61ab8bb12b90981a3a6010429816d70eaa041e622043207bcb74239b664d4f3')
|
||||
|
||||
|
|
@ -23,6 +24,11 @@ class PyIpywidgets(PythonPackage):
|
|||
depends_on('py-traitlets@4.2.1:', type=('build', 'run'))
|
||||
depends_on('py-traitlets@4.3.1:', type=('build', 'run'), when='@6:')
|
||||
depends_on('py-nbformat@4.2.0:', type=('build', 'run'), when='@6:')
|
||||
depends_on('py-widgetsnbextension@3.4.0:3.4.999', type=('build', 'run'), when='@6:')
|
||||
depends_on('py-widgetsnbextension@1.2.6:1.9', type=('build', 'run'),
|
||||
when='@5.2.2')
|
||||
depends_on('py-widgetsnbextension@3.4.0:3.4.999', type=('build', 'run'),
|
||||
when='@7.4.2')
|
||||
depends_on('py-widgetsnbextension@3.5.0:3.5.999', type=('build', 'run'),
|
||||
when='@7.5.1')
|
||||
depends_on('py-mock', type='test', when='^python@2.7:2.8')
|
||||
depends_on('py-nose', type='test')
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ class PyJupyterConsole(PythonPackage):
|
|||
homepage = "https://github.com/jupyter/jupyter_console"
|
||||
url = "https://github.com/jupyter/jupyter_console/archive/5.0.0.tar.gz"
|
||||
|
||||
version('6.1.0', sha256='838c95c99ce52978e1660e7a30dd933dede158e2f4da1bc5fad1a8fad44570b7')
|
||||
version('5.2.0', sha256='371d03aeefcf48967f2f00af4c1709f52d2a688deee33f395c6330e4e8aa171c')
|
||||
version('5.0.0', sha256='e966b2b5bf9a1e8c5bd11a6335bb11f68ec585ea39b801721b2ed9dd964468fa')
|
||||
version('4.1.1', sha256='0bb06a1f878d0c44c2f6f66406a80f949bcd86f3508035500af7dceffb9cc7dc')
|
||||
|
|
@ -19,8 +20,12 @@ class PyJupyterConsole(PythonPackage):
|
|||
version('4.0.3', sha256='b1867a89b693f247e9089a8f367fa4f27af6eac27930cad2966054adfa7b9aa1')
|
||||
version('4.0.2', sha256='116a56763899bbb12c762f865372eb52c08619ef070c237c7f1387e192bfd3df')
|
||||
|
||||
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-jupyter-client', type=('build', 'run'))
|
||||
depends_on('py-ipython@:5.8.0', type=('build', 'run'), when='@:5')
|
||||
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', type=('build', 'run'), when='@:5')
|
||||
depends_on('py-prompt-toolkit@2.0.0:2.999,3.0.2:3.0.999', type=('build', 'run'), when='@6:')
|
||||
|
|
|
|||
|
|
@ -52,7 +52,10 @@ def configure_args(self):
|
|||
args = [
|
||||
'--pyuic5-interpreter', self.spec['python'].command.path,
|
||||
'--sipdir', self.prefix.share.sip.PyQt5,
|
||||
'--stubsdir', join_path(site_packages_dir, 'PyQt5'),
|
||||
'--stubsdir', join_path(
|
||||
self.prefix,
|
||||
self.spec['python'].package.site_packages_dir,
|
||||
'PyQt5'),
|
||||
]
|
||||
if '+qsci' in self.spec:
|
||||
args.extend(['--qsci-api-destdir', self.prefix.share.qsci])
|
||||
|
|
@ -66,7 +69,10 @@ def make_qsci(self):
|
|||
'spack-resource-qscintilla/QScintilla_gpl-' +
|
||||
str(self.spec['qscintilla'].version), 'Python')
|
||||
with working_dir(rsrc_py_path):
|
||||
pydir = join_path(site_packages_dir, 'PyQt5')
|
||||
pydir = join_path(
|
||||
self.prefix,
|
||||
self.spec['python'].package.site_packages_dir,
|
||||
'PyQt5')
|
||||
python = self.spec['python'].command
|
||||
python('configure.py', '--pyqt=PyQt5',
|
||||
'--sip=' + self.prefix.bin.sip,
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class PyQtconsole(PythonPackage):
|
|||
|
||||
variant('doc', default=False, description='Build documentation')
|
||||
|
||||
depends_on('python@2.7:2.8,3.3:', type=('build', 'run'))
|
||||
depends_on('python@2.7:2.8,3.3:', type=('build', 'run'))
|
||||
depends_on('py-ipykernel@4.1:', type=('build', 'run'))
|
||||
depends_on('py-jupyter-client@4.1:', type=('build', 'run'))
|
||||
depends_on('py-jupyter-core', type=('build', 'run'))
|
||||
|
|
@ -25,5 +25,6 @@ class PyQtconsole(PythonPackage):
|
|||
depends_on('py-traitlets', type=('build', 'run'))
|
||||
depends_on('py-ipython-genutils', type=('build', 'run'), when='@4.5.1:')
|
||||
depends_on('py-sphinx@1.3:', type=('build', 'run'), when='+docs')
|
||||
depends_on('py-pyqt5', type='run')
|
||||
|
||||
depends_on('py-mock', type='test', when='^python@2.7:2.8')
|
||||
|
|
|
|||
Loading…
Reference in a new issue