Add dependencies and finish the py-tornado package.

This adds the following packages:

 py-backports-shutil-get-terminal-size  py-nbformat
 py-backports-ssl-match-hostname        py-pathlib2
 py-entrypoints                         py-pickleshare
 py-futures                             py-pip
 py-ipykernel                           py-prompt-toolkit
 py-ipython-genutils                    py-ptyprocess
 py-ipywidgets                          py-simplegeneric
 py-jupyter-client                      py-singledispatch
 py-jupyter-console                     py-terminado
 py-jupyter-core                        py-traitlets
 py-jupyter-notebook                    py-wcwidth
 py-monotonic                           py-widgetsnbextension
 py-nbconvert

34 files changed, 1200 insertions, 26 deletions

diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py
index 55d7aabc54..8f129bd3e0 100644
--- a/var/spack/repos/builtin/packages/node-js/package.py
+++ b/var/spack/repos/builtin/packages/node-js/package.py
@@ -34,22 +34,23 @@ class NodeJs(Package):
     homepage = "https://nodejs.org/"
     url      = "https://nodejs.org/download/release/v6.3.0/node-v6.3.0.tar.gz"
 
+    version('7.1.0', '1db5df2cb025f9c70e83d9cf21c4266a')
     version('6.3.0', '8c14e5c89d66d4d060c91b3ba15dfd31')
     version('6.2.2', '1120e8bf191fdaee42206d031935210d')
 
     # variant('bash-completion', default=False, description='Build with bash-completion support for npm')  # NOQA: ignore=E501
-    variant('debug',           default=False, description='Include debugger support')
-    variant('doc',             default=False, description='Compile with documentation')
-    variant('icu4c',           default=False, description='Build with support for all locales instead of just English')
-    variant('openssl',         default=True,  description='Build with Spacks OpenSSL instead of the bundled version')
-    variant('zlib',            default=True,  description='Build with Spacks zlib instead of the bundled version')
-
-    # depends_on('libtool',         type='build') # if sys.platform != 'darwin'
-    depends_on('pkg-config',      type='build')
-    depends_on('python@2.7:',     type='build')
+    variant('debug', default=False, description='Include debugger support')
+    variant('doc', default=False, description='Compile with documentation')
+    variant('icu4c', default=False, description='Build with support for all locales instead of just English')
+    variant('openssl', default=True,  description='Build with Spacks OpenSSL instead of the bundled version')
+    variant('zlib', default=True,  description='Build with Spacks zlib instead of the bundled version')
+
+    depends_on('libtool', type='build', when=sys.platform != 'darwin')
+    depends_on('pkg-config', type='build')
+    depends_on('python@2.7:2.7.999', type='build')
     # depends_on('bash-completion', when="+bash-completion")
-    depends_on('icu4c',           when='+icu4c')
-    depends_on('openssl',         when='+openssl')
+    depends_on('icu4c', when='+icu4c')
+    depends_on('openssl', when='+openssl')
 
     def install(self, spec, prefix):
         options = []
@@ -62,8 +63,12 @@ class NodeJs(Package):
         # On OSX, the system libtool must be used
         # So, we ensure that this is the case by...
         if sys.platform == 'darwin':
-            result_which = subprocess.check_output(["which", "libtool"])
-            result_whereis = subprocess.check_output(["whereis", "libtool"])
+            process_pipe = subprocess.Popen(["which", "libtool"], 
+                                            stdout=subprocess.PIPE)
+            result_which = process_pipe.communicate()[0]
+            process_pipe = subprocess.Popen(["whereis", "libtool"], 
+                                            stdout=subprocess.PIPE)
+            result_whereis = process_pipe.communicate()[0]
             assert result_which == result_whereis, (
                 'On OSX the system libtool must be used. Please'
                 '(temporarily) remove \n %s or its link to libtool from'
diff --git a/var/spack/repos/builtin/packages/npm/package.py b/var/spack/repos/builtin/packages/npm/package.py
index 36f460e1a2..7910a8af9b 100644
--- a/var/spack/repos/builtin/packages/npm/package.py
+++ b/var/spack/repos/builtin/packages/npm/package.py
@@ -22,6 +22,7 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
+import os
 from spack import *
 
 
@@ -32,9 +33,17 @@ class Npm(Package):
     # base http://www.npmjs.com/
     url      = "https://registry.npmjs.org/npm/-/npm-3.10.5.tgz"
 
+    version('3.10.9', 'ec1eb22b466ce87cdd0b90182acce07f')
     version('3.10.5', '46002413f4a71de9b0da5b506bf1d992')
 
-    depends_on('node-js', type='build')
+    depends_on('node-js')
+    
+    def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
+        npm_config_cache_dir = "%s/npm-cache" % dependent_spec.prefix
+        if not os.path.isdir(npm_config_cache_dir):
+            mkdir(npm_config_cache_dir)
+        run_env.set('npm_config_cache', npm_config_cache_dir)
+        spack_env.set('npm_config_cache', npm_config_cache_dir)
 
     def install(self, spec, prefix):
         configure('--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py
new file mode 100644
index 0000000000..5158fa3ad4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyBackportsShutilGetTerminalSize(Package):
+    """A backport of the get_terminal_size function 
+    from Python 3.3's shutil."""
+
+    homepage = "https://pypi.python.org/pypi/backports.shutil_get_terminal_size"
+    url      = "https://pypi.io/packages/source/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-1.0.0.tar.gz"
+
+    version('1.0.0', '03267762480bd86b50580dc19dff3c66')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('python@:3.2.999')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py
new file mode 100644
index 0000000000..13b3a1abd4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyBackportsSslMatchHostname(Package):
+    """The ssl.match_hostname() function from Python 3.5"""
+
+    homepage = "https://pypi.python.org/pypi/backports.ssl_match_hostname"
+    url      = "https://pypi.io/packages/source/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.5.0.1.tar.gz"
+
+    version('3.5.0.1', 'c03fc5e2c7b3da46b81acf5cbacfe1e6')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-entrypoints/package.py b/var/spack/repos/builtin/packages/py-entrypoints/package.py
new file mode 100644
index 0000000000..944999d69b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-entrypoints/package.py
@@ -0,0 +1,40 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyEntrypoints(Package):
+    """Discover and load entry points from installed packages."""
+
+    homepage = "https://pypi.python.org/pypi/entrypoints"
+    url      = "https://files.pythonhosted.org/packages/f8/ad/0e77a853c745a15981ab51fa9a0cb4eca7a7a007b4c1970106ee6ba01e0c/entrypoints-0.2.2-py2.py3-none-any.whl"
+
+    version('0.2.2', '73bd7ce92c19b25dc5a20aff41be996a', expand=False)
+
+    depends_on('py-pip', type='build')
+
+    def install(self, spec, prefix):
+        pip = which('pip')
+        pip('install', self.stage.archive_file, '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-functools32/package.py b/var/spack/repos/builtin/packages/py-functools32/package.py
index 275d75f4ac..dc4e49d278 100644
--- a/var/spack/repos/builtin/packages/py-functools32/package.py
+++ b/var/spack/repos/builtin/packages/py-functools32/package.py
@@ -35,7 +35,7 @@ class PyFunctools32(Package):
 
     version('3.2.3-2', '09f24ffd9af9f6cd0f63cb9f4e23d4b2')
 
-    extends('python', type=nolink)
+    extends('python')
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-futures/package.py b/var/spack/repos/builtin/packages/py-futures/package.py
new file mode 100644
index 0000000000..20bf4c7dae
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-futures/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyFutures(Package):
+    """Backport of the concurrent.futures package from Python 3.2"""
+
+    homepage = "https://pypi.python.org/pypi/futures"
+    url      = "https://pypi.io/packages/source/f/futures/futures-3.0.5.tar.gz"
+
+    version('3.0.5', 'ced2c365e518242512d7a398b515ff95')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py
new file mode 100644
index 0000000000..d68cfa2ae4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py
@@ -0,0 +1,56 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyIpykernel(Package):
+    """IPython Kernel for Jupyter"""
+
+    homepage = "https://pypi.python.org/pypi/ipykernel"
+    url      = "https://github.com/ipython/ipykernel/archive/4.5.0.tar.gz"
+
+    version('4.5.0', 'ea6aaf431b100452905aaca208edac72')
+    version('4.4.1', 'c0033e524aa9e05ed18879641ffe6e0f')
+    version('4.4.0', '8e626a1708ceff83412180d2ff2f3e57')
+    version('4.3.1', '971eee85d630eb4bafcd52531c79673f')
+    version('4.3.0', '5961164fe908faf798232a265ed48c73')
+    version('4.2.2', '4ac8ae11f1eef4920bf4a5383e13ab50')
+    version('4.2.1', 'de583ee9c84db6296269ce7de0afb63f')
+    version('4.2.0', 'fc535e4e020a41cd2b55508302b155bb')
+    version('4.1.1', '51376850c46fb006e1f8d1cd353507c5')
+    version('4.1.0', '638a43e4f8a15872f749090c3f0827b6')
+
+    extends('python')
+
+    depends_on('python@2.7:2.7.999,3.3:')
+    depends_on('py-setuptools', type='build')
+    depends_on('py-traitlets@4.1.0:')
+    depends_on('py-tornado@4.0:')
+    depends_on('py-ipython@4.0:')
+    depends_on('py-jupyter-client')
+    depends_on('py-pexpect')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py
new file mode 100644
index 0000000000..75b20e08e9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py
@@ -0,0 +1,42 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyIpythonGenutils(Package):
+    """Vestigial utilities from IPython"""
+
+    homepage = "https://pypi.python.org/pypi/ipython_genutils"
+    url      = "https://pypi.io/packages/source/i/ipython_genutils/ipython_genutils-0.1.0.tar.gz"
+
+    version('0.1.0', '9a8afbe0978adbcbfcb3b35b2d015a56')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('python@2.7:2.7.999,3.3:')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py
index d7ee2e3c95..0c7cb7ab67 100644
--- a/var/spack/repos/builtin/packages/py-ipython/package.py
+++ b/var/spack/repos/builtin/packages/py-ipython/package.py
@@ -29,14 +29,19 @@ class PyIpython(Package):
     """IPython provides a rich toolkit to help you make the most out of using
        Python interactively."""
     homepage = "https://pypi.python.org/pypi/ipython"
-    url      = "https://pypi.python.org/packages/source/i/ipython/ipython-2.3.1.tar.gz"
+    url      = "https://pypi.io/packages/source/i/ipython/ipython-2.3.1.tar.gz"
 
-    version('2.3.1', '2b7085525dac11190bfb45bb8ec8dcbf')
+    version('5.1.0', '47c8122420f65b58784cb4b9b4af35e3')
     version('3.1.0', 'a749d90c16068687b0ec45a27e72ef8f')
+    version('2.3.1', '2b7085525dac11190bfb45bb8ec8dcbf')
 
     extends('python')
     depends_on('py-pygments', type=nolink)
     depends_on('py-setuptools', type=nolink)
+    depends_on('py-backports-shutil-get-terminal-size', when="^python@:3.2.999")
+    depends_on('py-pathlib2', when="^python@:3.3.999")
+    depends_on('py-pickleshare')
+    depends_on('py-simplegeneric')
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-ipywidgets/package.py b/var/spack/repos/builtin/packages/py-ipywidgets/package.py
new file mode 100644
index 0000000000..c9b2e9c168
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-ipywidgets/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyIpywidgets(Package):
+    """IPython widgets for the Jupyter Notebook"""
+
+    homepage = "https://github.com/ipython/ipywidgets"
+    url      = "https://github.com/ipython/ipywidgets/archive/5.2.2.tar.gz"
+
+    version('5.2.2', '112f3daa4aa0f42f8dda831cea3649c8')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('python@2.7:2.7.999,3.3:')
+    depends_on('py-ipython@4.0.0:')
+    depends_on('py-ipykernel@4.2.2:')
+    depends_on('py-traitlets@4.2.1:')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py
index 7f6c52a970..d41ee439db 100644
--- a/var/spack/repos/builtin/packages/py-jsonschema/package.py
+++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py
@@ -37,7 +37,7 @@ class PyJsonschema(Package):
     extends('python')
     depends_on('py-setuptools', type='build')
     depends_on('py-vcversioner')
-    depends_on('py-functools32')
+    depends_on('py-functools32', when="^python@2.7")
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-jupyter-client/package.py b/var/spack/repos/builtin/packages/py-jupyter-client/package.py
new file mode 100644
index 0000000000..c8268c8aa2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-jupyter-client/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyJupyterClient(Package):
+    """Jupyter protocol client APIs"""
+
+    homepage = "https://github.com/jupyter/jupyter_client"
+    url      = "https://github.com/jupyter/jupyter_client/archive/4.4.0.tar.gz"
+
+    version('4.4.0', 'a0bd6fe6ba7c504fbc962a88a2a56a90')
+    version('4.3.0', '257d9f5429dac4d9511db84d201d3a9e')
+    version('4.2.2', '988ea87554215a83c6ad52e554d8d8c4')
+    version('4.2.1', '16994e5cace322c777456bc5a26502d7')
+    version('4.2.0', '61c43c9f243e42f1945fae5d56d0d23c')
+    version('4.1.1', '8436e4a3266a442f576cdfef39dc0e19')
+    version('4.1.0', 'cf42048b889c8434fbb5813a9eec1d34')
+    version('4.0.0', '00fa63c67cb3adf359d09dc4d803aff5')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('python@2.7:2.7.999,3.3:')
+    depends_on('py-traitlets')
+    depends_on('py-jupyter-core')
+    depends_on('py-zmq@13:')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-jupyter-console/package.py b/var/spack/repos/builtin/packages/py-jupyter-console/package.py
new file mode 100644
index 0000000000..1cc432e2e0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-jupyter-console/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyJupyterConsole(Package):
+    """Jupyter Terminal Console"""
+
+    homepage = "https://github.com/jupyter/jupyter_console"
+    url      = "https://github.com/jupyter/jupyter_console/archive/5.0.0.tar.gz"
+
+    version('5.0.0', '08a9fde32a45c9e2e0b4cec6eca249c2')
+    version('4.1.1', 'a8b077ae0a5c57e9518ac039ad5febb8')
+    version('4.1.0', '9c655076262760bdbeeada9d7f586237')
+    version('4.0.3', '0e928ea261e7f8154698cf69ed4f2459')
+    version('4.0.2', 'f2e174938c91136549b908bd39fa5d59')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('python@2.7:2.7.999,3.3:')
+    depends_on('py-jupyter-client')
+    depends_on('py-ipython')
+    depends_on('py-ipykernel')
+    depends_on('py-pygments')
+    depends_on('py-prompt-toolkit@1.0.0:1.999.999')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-jupyter-core/package.py b/var/spack/repos/builtin/packages/py-jupyter-core/package.py
new file mode 100644
index 0000000000..ae4f192437
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-jupyter-core/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyJupyterCore(Package):
+    """Core Jupyter functionality"""
+
+    homepage = "http://jupyter-core.readthedocs.io/"
+    url      = "https://github.com/jupyter/jupyter_core/archive/4.2.0.tar.gz"
+
+    version('4.2.0', '25c1fc68b1b73c0a2e616c76f02bf061')
+    version('4.1.1', '2fce5ff60291bc01b39b1f00b3cbb784')
+    version('4.1.0', 'b7e928f965f68aef13fea1bf9d6384aa')
+    version('4.0.6', '50a73c3a4a8ed047a3674d2b5274cc3b')
+    version('4.0.5', 'c09bd3be58f141b49b90cdb2ba22f77f')
+    version('4.0.4', '5b6ca0e73bf559f4fe6106a6e412f913')
+    version('4.0.3', 'f2608f6e92f992ec8e37646b52c922a6')
+    version('4.0.2', 'ae0d0197c4febf43c050a97ac6277263')
+    version('4.0.1', 'f849136b2badaaba2a8a3b397bf04639')
+    version('4.0'  , 'b6b37cb4f40bd0fcd20433cb2cc7a4c1')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('python@2.7:2.7.999,3.3:')
+    depends_on('py-traitlets')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py
new file mode 100644
index 0000000000..c9eb51d2d4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py
@@ -0,0 +1,66 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyJupyterNotebook(Package):
+    """Jupyter Interactive Notebook"""
+
+    homepage = "https://github.com/jupyter/notebook"
+    url      = "https://github.com/jupyter/notebook/archive/4.2.3.tar.gz"
+
+    version('4.2.3', '5c6b0b1303adacd8972c4db21eda3e98')
+    version('4.2.2', '7f9717ae4fed930d187a44c0707b6379')
+    version('4.2.1', '4286f1eaf608257bd69cad4042c7c2fe')
+    version('4.2.0', '136be6b72fe9db7f0269dc7fa5652a62')
+    version('4.1.0', '763ab54b3fc69f6225b9659b6994e756')
+    version('4.0.6', 'd70d8a6d01893f4b64df9edbc0e13b52')
+    version('4.0.5', '2681a70e4c62aafe7ce69f1da5799ac8')
+    version('4.0.4', 'ab72f28f6af8107d71241a4110e92c05')
+    version('4.0.3', '119beea793865ee4b1673a50043ead2a')
+    version('4.0.2', '77f371e9a23a840d14d8a60fee7ba1b7')
+
+    variant('terminal', default=False, description="Enable terminal functionality")
+
+    extends('python')
+    
+    depends_on('py-setuptools', type='build')
+    depends_on('python@2.7:2.7.999,3.3:')
+    depends_on('npm', type='build')
+    depends_on('py-jinja2')
+    depends_on('py-tornado@4:')
+    depends_on('py-ipython-genutils')
+    depends_on('py-traitlets')
+    depends_on('py-jupyter-core')
+    depends_on('py-jupyter-client')
+    depends_on('py-jupyter-console')
+    depends_on('py-nbformat')
+    depends_on('py-nbconvert')
+    depends_on('py-ipykernel')
+    depends_on('py-terminado@0.3.3:', when="+terminal")
+    depends_on('py-ipywidgets', when="+terminal")
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-monotonic/package.py b/var/spack/repos/builtin/packages/py-monotonic/package.py
new file mode 100644
index 0000000000..6584aa248c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-monotonic/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyMonotonic(Package):
+    """An implementation of time.monotonic() for Python 2 & < 3.3"""
+
+    homepage = "https://pypi.python.org/pypi/monotonic"
+    url      = "https://pypi.io/packages/source/m/monotonic/monotonic-1.2.tar.gz"
+
+    version('1.2', 'd14c93aabc3d6af25ef086b032b123cf')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py
new file mode 100644
index 0000000000..41a1c89686
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py
@@ -0,0 +1,54 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyNbconvert(Package):
+    """Jupyter Notebook Conversion"""
+
+    homepage = "https://github.com/jupyter/nbconvert"
+    url      = "https://github.com/jupyter/nbconvert/archive/4.2.0.tar.gz"
+
+    version('4.2.0' , '8bd88771cc00f575d5edcd0b5197f964')
+    version('4.1.0' , '06655576713ba1ff7cece2b92760c187')
+    version('4.0.0' , '9661620b1e10a7b46f314588d2d0932f')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('py-pycurl', type='build')
+    depends_on('python@2.7:2.7.999,3.3:')
+    depends_on('py-mistune')
+    depends_on('py-jinja2')
+    depends_on('py-pygments')
+    depends_on('py-traitlets')
+    depends_on('py-jupyter-core')
+    depends_on('py-nbformat')
+    depends_on('py-entrypoints')
+    depends_on('py-tornado')
+    depends_on('py-jupyter-client')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-nbformat/package.py b/var/spack/repos/builtin/packages/py-nbformat/package.py
new file mode 100644
index 0000000000..f45236fc34
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-nbformat/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyNbformat(Package):
+    """The Jupyter Notebook format"""
+
+    homepage = "https://github.com/jupyter/nbformat"
+    url      = "https://github.com/jupyter/nbformat/archive/4.1.0.tar.gz"
+
+    version('4.1.0', '826b4fc4ec42553b20144f53b57b4e7b')
+    version('4.0.1', 'ab7172e517c9d561c0c01eef5631b4c8')
+    version('4.0.0', '7cf61359fa4e9cf3ef5e969e2fcb909e')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('py-ipython-genutils')
+    depends_on('py-traitlets')
+    depends_on('py-jsonschema')
+    depends_on('py-jupyter-core')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-pathlib2/package.py b/var/spack/repos/builtin/packages/py-pathlib2/package.py
new file mode 100644
index 0000000000..8db18261b8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pathlib2/package.py
@@ -0,0 +1,42 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyPathlib2(Package):
+    """Backport of pathlib from python 3.4"""
+
+    homepage = "https://pypi.python.org/pypi/pathlib2"
+    url      = "https://pypi.io/packages/source/p/pathlib2/pathlib2-2.1.0.tar.gz"
+
+    version('2.1.0', '38e4f58b4d69dfcb9edb49a54a8b28d2')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('python@:3.3.999')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-pexpect/package.py b/var/spack/repos/builtin/packages/py-pexpect/package.py
index 9e43e4526e..99b69fc30b 100644
--- a/var/spack/repos/builtin/packages/py-pexpect/package.py
+++ b/var/spack/repos/builtin/packages/py-pexpect/package.py
@@ -28,11 +28,13 @@ from spack import *
 class PyPexpect(Package):
     """Pexpect allows easy control of interactive console applications."""
     homepage = "https://pypi.python.org/pypi/pexpect"
-    url      = "https://pypi.python.org/packages/source/p/pexpect/pexpect-3.3.tar.gz"
+    url      = "https://pypi.io/packages/source/p/pexpect/pexpect-4.2.1.tar.gz"
 
-    version('3.3', '0de72541d3f1374b795472fed841dce8')
+    version('4.2.1', '3694410001a99dff83f0b500a1ca1c95')
 
     extends('python')
+    
+    depends_on('py-ptyprocess')
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-pickleshare/package.py b/var/spack/repos/builtin/packages/py-pickleshare/package.py
new file mode 100644
index 0000000000..09a810869d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pickleshare/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyPickleshare(Package):
+    """Tiny 'shelve'-like database with concurrency support"""
+
+    homepage = "https://pypi.python.org/pypi/pickleshare"
+    url      = "https://pypi.io/packages/source/p/pickleshare/pickleshare-0.7.4.tar.gz"
+
+    version('0.7.4', '6a9e5dd8dfc023031f6b7b3f824cab12')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py
new file mode 100644
index 0000000000..dca73f763f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pip/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyPip(Package):
+    """The PyPA recommended tool for installing Python packages."""
+
+    homepage = "https://pypi.python.org/pypi/pip"
+    url      = "https://pypi.io/packages/source/p/pip/pip-9.0.1.tar.gz"
+
+    version('9.0.1', '35f01da33009719497f01a4ba69d63c9')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py
new file mode 100644
index 0000000000..5c81cf1701
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyPromptToolkit(Package):
+    """Library for building powerful interactive command lines in Python"""
+
+    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('1.0.9', 'a39f91a54308fb7446b1a421c11f227c')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('py-six@1.9.0:')
+    depends_on('py-wcwidth')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-ptyprocess/package.py b/var/spack/repos/builtin/packages/py-ptyprocess/package.py
new file mode 100644
index 0000000000..fc65e617ba
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-ptyprocess/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyPtyprocess(Package):
+    """Run a subprocess in a pseudo terminal"""
+
+    homepage = "https://pypi.python.org/pypi/ptyprocess"
+    url      = "https://pypi.io/packages/source/p/ptyprocess/ptyprocess-0.5.1.tar.gz"
+
+    version('0.5.1', '94e537122914cc9ec9c1eadcd36e73a1')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-pycurl/package.py b/var/spack/repos/builtin/packages/py-pycurl/package.py
index 9f93c1ca44..ab62440f8e 100644
--- a/var/spack/repos/builtin/packages/py-pycurl/package.py
+++ b/var/spack/repos/builtin/packages/py-pycurl/package.py
@@ -35,8 +35,9 @@ class PyPycurl(Package):
     version('7.43.0', 'c94bdba01da6004fa38325e9bd6b9760')
 
     extends('python')
+    depends_on('python@2.6:')
     depends_on('py-setuptools', type='build')
-    depends_on('curl')
+    depends_on('curl@7.19.0:')
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-simplegeneric/package.py b/var/spack/repos/builtin/packages/py-simplegeneric/package.py
new file mode 100644
index 0000000000..b2ee72822b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-simplegeneric/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PySimplegeneric(Package):
+    """Simple generic functions (similar to Python's own len(), 
+    pickle.dump(), etc.)"""
+
+    homepage = "https://pypi.python.org/pypi/simplegeneric"
+    url      = "https://pypi.io/packages/source/s/simplegeneric/simplegeneric-0.8.zip"
+
+    version('0.8.1', 'f9c1fab00fd981be588fc32759f474e3')
+    version('0.8', 'eaa358a5f9517a8b475d03fbee3ec90f')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-singledispatch/package.py b/var/spack/repos/builtin/packages/py-singledispatch/package.py
new file mode 100644
index 0000000000..05d8c16b44
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-singledispatch/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PySingledispatch(Package):
+    """This library brings functools.singledispatch to Python 2.6-3.3."""
+
+    homepage = "https://pypi.python.org/pypi/singledispatch"
+    url      = "https://pypi.io/packages/source/s/singledispatch/singledispatch-3.4.0.3.tar.gz"
+
+    version('3.4.0.3', 'af2fc6a3d6cc5a02d0bf54d909785fcb')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('py-six')
+    depends_on('py-ordereddict', when="^python@:2.6.999")
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-terminado/package.py b/var/spack/repos/builtin/packages/py-terminado/package.py
new file mode 100644
index 0000000000..e9db560cd5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-terminado/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyTerminado(Package):
+    """Terminals served to term.js using Tornado websockets"""
+
+    homepage = "https://pypi.python.org/pypi/terminado"
+    url      = "https://pypi.io/packages/source/t/terminado/terminado-0.6.tar.gz"
+
+    version('0.6', '5b6c65da27fe1ed07a9f80f0588cdaba')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('py-tornado@4:')
+    depends_on('py-ptyprocess')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-tornado/package.py b/var/spack/repos/builtin/packages/py-tornado/package.py
index 78ead79959..0de77a2d57 100644
--- a/var/spack/repos/builtin/packages/py-tornado/package.py
+++ b/var/spack/repos/builtin/packages/py-tornado/package.py
@@ -33,11 +33,17 @@ class PyTornado(Package):
     url      = "https://github.com/tornadoweb/tornado/archive/v4.4.0.tar.gz"
 
     version('4.4.0', 'c28675e944f364ee96dda3a8d2527a87ed28cfa3')
-
+    
     extends('python')
+    
     depends_on('py-setuptools', type='build')
-    depends_on('py-backports-abc')
-    depends_on('py-certifi')
-
+    
+    # requirements from setup.py
+    depends_on('py-backports-ssl-match-hostname', when='^python@:2.7.8')
+    depends_on('py-singledispatch', when='^python@:3.3')
+    depends_on('py-certifi', when='^python@:3.3')
+    depends_on('py-backports-abc@0.4:', when='^python@:3.4')
+    
     def install(self, spec, prefix):
+        setup_py('build')
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-traitlets/package.py b/var/spack/repos/builtin/packages/py-traitlets/package.py
new file mode 100644
index 0000000000..c414dba758
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-traitlets/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyTraitlets(Package):
+    """Traitlets Python config system"""
+
+    homepage = "https://pypi.python.org/pypi/traitlets"
+    url      = "https://github.com/ipython/traitlets/archive/4.3.1.tar.gz"
+
+    version('4.3.1', '146a4885ea64079f62a33b2049841543')
+    version('4.3.0', '17af8d1306a401c42dbc92a080722422')
+    version('4.2.2', 'ffc03056dc5c8d1fc5dbd6eac76e1e46')
+    version('4.2.1', 'fc7f46a76b99ebc5068f99033d268dcf')
+    version('4.2.0', '53553a10d124e264fd2e234d0571b7d0')
+    version('4.1.0', 'd5bc75c7bd529afb40afce86c2facc3a')
+    version('4.0.0', 'b5b95ea5941fd9619b4704dfd8201568')
+    version('4.0'  , '14544e25ccf8e920ed1cbf833852481f')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('py-decorator', type=nolink)
+    depends_on('py-ipython-genutils')
+    depends_on('py-enum34', when='^python@:3.3')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-wcwidth/package.py b/var/spack/repos/builtin/packages/py-wcwidth/package.py
new file mode 100644
index 0000000000..2740d749b5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-wcwidth/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyWcwidth(Package):
+    """Measures number of Terminal column cells of wide-character codes"""
+
+    homepage = "https://pypi.python.org/pypi/wcwidth"
+    url      = "https://pypi.io/packages/source/w/wcwidth/wcwidth-0.1.7.tar.gz"
+
+    version('0.1.7', 'b3b6a0a08f0c8a34d1de8cf44150a4ad')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py
new file mode 100644
index 0000000000..c0833806f8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyWidgetsnbextension(Package):
+    """IPython HTML widgets for Jupyter"""
+
+    homepage = "https://pypi.python.org/pypi/widgetsnbextension"
+    url      = "https://pypi.io/packages/source/w/widgetsnbextension/widgetsnbextension-1.2.6.tar.gz"
+
+    version('1.2.6', '0aa4e152c9ba2d704389dc2453f448c7')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('python@2.7:2.7.999,3.3:')
+    depends_on('py-jupyter-notebook@4.2.0:')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-zmq/package.py b/var/spack/repos/builtin/packages/py-zmq/package.py
index 1dfe07a8fb..ff2373c2f4 100644
--- a/var/spack/repos/builtin/packages/py-zmq/package.py
+++ b/var/spack/repos/builtin/packages/py-zmq/package.py
@@ -31,11 +31,14 @@ class PyZmq(Package):
     # base https://pypi.python.org/pypi/pyzmq/
     url      = "https://github.com/zeromq/pyzmq/archive/v14.7.0.tar.gz"
 
+    version('16.0.2', '4cf14a2995742253b2b009541f4436f4')
     version('14.7.0', 'bf304fb73d72aee314ff82d3554328c179938ecf')
 
     extends('python')
     depends_on('py-setuptools', type='build')
-    depends_on('py-cython')
+    depends_on('py-cython@0.16:')
+    depends_on('py-py')
+    depends_on('py-cffi')
     depends_on('zeromq')
 
     def install(self, spec, prefix):