update py-nbconvert (#13422)

* update py-nbconvert

* add setuptools dependency, like all the other jupyter packages
  it seems to be using setuptools for some commands all the time
  but requires it for the newest version
* added dependencies, not necessarily only needed for the latest one
* depends on new packages (defusedxml, pandocfilters, testpath)
* should also be moved to pypi sources?
* '@5:@5:' is a valid spec -> intended?

* make dependencies optional

* Update dependencies and add description

* relax py-mistune dependency restriction

* Update var/spack/repos/builtin/packages/py-nbconvert/package.py

Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>

1 files changed, 20 insertions, 5 deletions

diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py
index 0634c6b5d0..cda45e60f6 100644
--- a/var/spack/repos/builtin/packages/py-nbconvert/package.py
+++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py
@@ -13,21 +13,36 @@ class PyNbconvert(PythonPackage):
     homepage = "https://github.com/jupyter/nbconvert"
     url      = "https://github.com/jupyter/nbconvert/archive/4.2.0.tar.gz"
 
+    version('5.6.0', sha256='21a69fe5756a3af8e76dcc105217cc3bea4d8f23dbff5727d9fd1e4388b53beb')
     version('4.2.0', sha256='32394be5a20f39f99fabfb9b2f2625df17f1c2a6699182ca41598e98e7cc9610')
     version('4.1.0', sha256='459f23381411fd1ff9ec5ed71fcd56b8c080d97b3a1e47dae1c5c391f9a47266')
     version('4.0.0', sha256='00e25eeca90523ba6b774b289073631ef5ac65bb2de9774e9b7f29604516265c')
 
-    depends_on('py-pycurl', type='build')
-    depends_on('python@2.7:2.8,3.3:')
-    depends_on('py-mistune', type=('build', 'run'))
+    variant('execute', default=True, description='Include jupyter-client')
+    variant('serve', default=True, description='Include a webserver')
+
+    depends_on('py-pycurl', type='build',                         when='^python@2.7:2.8')
+    depends_on('py-setuptools', type='build',                     when='@5:')
+    depends_on('python@2.7:2.8,3.3:', type=('build', 'run'))
+    depends_on('python@2.7:2.8,3.5:', type=('build', 'run'),      when='@5:')
+    depends_on('py-mistune@0.8.1:1.999', type=('build', 'run'))
     depends_on('py-jinja2', type=('build', 'run'))
+    depends_on('py-jinja2@2.4:', type=('build', 'run'),           when='@5:')
     depends_on('py-pygments', type=('build', 'run'))
     depends_on('py-traitlets', type=('build', 'run'))
+    depends_on('py-traitlets@4.2:', type=('build', 'run'),        when='@5:')
     depends_on('py-jupyter-core', type=('build', 'run'))
     depends_on('py-nbformat', type=('build', 'run'))
+    depends_on('py-nbformat@4.4.0:', type=('build', 'run'),       when='@5:')
     depends_on('py-entrypoints', type=('build', 'run'))
-    depends_on('py-tornado', type=('build', 'run'))
-    depends_on('py-jupyter-client', type=('build', 'run'))
+    depends_on('py-entrypoints@0.2.2:', type=('build', 'run'),    when='@5:')
+    depends_on('py-tornado@4.0:', type=('build', 'run'),          when='+serve')
+    depends_on('py-jupyter-client', type=('build', 'run'),        when='+execute')
+    depends_on('py-jupyter-client@5.3.1:', type=('build', 'run'), when='@5:+execute')
+    depends_on('py-defusedxml', type=('build', 'run'),            when='@5:')
+    depends_on('py-testpath', type=('build', 'run'),              when='@5:')
+    depends_on('py-bleach', type=('build', 'run'),                when='@5:')
+    depends_on('py-pandocfilters@1.4.1:', type=('build', 'run'),  when='@5:')
 
     def patch(self):
         # We bundle this with the spack package so that the installer