Add package: git-review (#3088)

* Add git-review

* Fix flake8 errors

* use PythonPackage for git-review

* added dependencies for git-review

* fix flake8

* moved url's to pypi.io based urls

* fixed flake8... again

* mostly url fixes, not tested, will do tomorrow

* flake8 fix

* changed URL for py-pysocks

* Fixed URL for pysocks

* fixed url

15 files changed, 451 insertions, 7 deletions

diff --git a/var/spack/repos/builtin/packages/py-click/package.py b/var/spack/repos/builtin/packages/py-click/package.py
new file mode 100644
index 0000000000..6645134f48
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-click/package.py
@@ -0,0 +1,36 @@
+##############################################################################
+# 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 PyClick(PythonPackage):
+    """A simple wrapper around optparse for powerful command line utilities."""
+
+    homepage = "http://github.com/mitsuhiko/click"
+    url = "https://pypi.io/packages/source/c/click/click-6.6.tar.gz"
+
+    version('6.6', 'd0b09582123605220ad6977175f3e51d')
+
+    depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-coverage/package.py b/var/spack/repos/builtin/packages/py-coverage/package.py
index dc8fc08e24..1dcaeec7d5 100644
--- a/var/spack/repos/builtin/packages/py-coverage/package.py
+++ b/var/spack/repos/builtin/packages/py-coverage/package.py
@@ -29,8 +29,9 @@ class PyCoverage(PythonPackage):
     """ Testing coverage checker for python """
 
     homepage = "http://nedbatchelder.com/code/coverage/"
-    url      = "https://pypi.python.org/packages/source/c/coverage/coverage-4.0a6.tar.gz"
+    url      = "https://pypi.io/packages/source/c/coverage/coverage-4.3.4.tar.gz"
 
+    version('4.3.4', 'd347766b06bbb4fd0bc822014b7cfb0a')
     version('4.0a6', '1bb4058062646148965bef0796b61efc')
 
     depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-enum34/package.py b/var/spack/repos/builtin/packages/py-enum34/package.py
index cc111ce092..9c0bd64685 100644
--- a/var/spack/repos/builtin/packages/py-enum34/package.py
+++ b/var/spack/repos/builtin/packages/py-enum34/package.py
@@ -29,15 +29,13 @@ class PyEnum34(PythonPackage):
     """Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4."""
 
     homepage = "https://pypi.python.org/pypi/enum34"
-    url      = "https://pypi.python.org/packages/source/e/enum34/enum34-1.1.6.tar.gz"
+    url      = "https://pypi.io/packages/source/e/enum34/enum34-1.1.6.tar.gz"
 
-    version('1.1.6', '5f13a0841a61f7fc295c514490d120d0',
-            url="https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz")
+    version('1.1.6', '5f13a0841a61f7fc295c514490d120d0')
 
-    depends_on('python@2.4:2.8,3.3:')
+    depends_on('python')
 
     # This dependency breaks concretization
     # See https://github.com/LLNL/spack/issues/2793
     # depends_on('py-ordereddict', when='^python@:2.6.999', type=('build', 'run'))  # noqa
-
     depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-flask/package.py b/var/spack/repos/builtin/packages/py-flask/package.py
new file mode 100644
index 0000000000..cd400f6339
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-flask/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 PyFlask(PythonPackage):
+    """A microframework based on Werkzeug, Jinja2 and good intentions"""
+
+    homepage = "http://github.com/pallets/flask"
+    url      = "https://pypi.io/packages/source/f/flask/flask-0.11.1.tar.gz"
+
+    version('0.11.1', 'd2af95d8fe79cf7da099f062dd122a08')
+
+    depends_on('py-setuptools',         type='build')
+    depends_on('py-werkzeug@0.7:',      type=('build', 'run'))
+    depends_on('py-jinja2@2.4:',        type=('build', 'run'))
+    depends_on('py-itsdangerous@0.21:', type=('build', 'run'))
+    depends_on('py-click@2.0:',         type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-git-review/package.py b/var/spack/repos/builtin/packages/py-git-review/package.py
new file mode 100644
index 0000000000..6e6ebbbdaf
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-git-review/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# 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 PyGitReview(PythonPackage):
+    """git-review is a tool that helps submitting git branches to gerrit"""
+
+    homepage = "http://docs.openstack.org/infra/git-review"
+    url = "https://pypi.io/packages/source/g/git-review/git-review-1.25.0.tar.gz"
+
+    version('1.25.0', '0a061d0e23ee9b93c6212a3fe68fb7ab')
+    version('1.24',   '145116fe58a3487c3ad1bf55538fd741')
+    version('1.23',   'b0023ad8c037ab710da81412194c6a3a')
+    version('1.22',   'e889df5838c059362e5e0d411bde9c48')
+    version('1.21',   'eee88bdef1aa37a55cc8becd48c6aba9')
+
+    extends('python')
+
+    depends_on('py-setuptools',    type=('build'))
+    depends_on('py-pbr',           type=('build', 'run'))
+    depends_on('py-requests@1.1:', type=('build', 'run'))
+    depends_on('git',              type=('run'))
+    depends_on('tk',               type=('run'))
+
+    def setup_environment(self, spack_env, run_env):
+        run_env.set('PBR_VERSION', self.spec.version)
diff --git a/var/spack/repos/builtin/packages/py-httpbin/package.py b/var/spack/repos/builtin/packages/py-httpbin/package.py
new file mode 100644
index 0000000000..70557ca840
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-httpbin/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 PyHttpbin(PythonPackage):
+    """HTTP Request and Response Service"""
+
+    homepage = "https://github.com/Runscope/httpbin"
+    url = "https://pypi.io/packages/source/h/httpbin/httpbin-0.5.0.tar.gz"
+
+    version('0.5.0', '923793df99156caa484975ade96ee115')
+
+    depends_on('py-setuptools',         type='build')
+    depends_on('py-decorator@3.4.0:',   type=('build', 'run'))
+    depends_on('py-flask@0.10.1:',      type=('build', 'run'))
+    depends_on('py-itsdangerous@0.24:', type=('build', 'run'))
+    depends_on('py-markupsafe@0.23:',   type=('build', 'run'))
+    depends_on('py-six@1.6.1:',         type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-itsdangerous/package.py b/var/spack/repos/builtin/packages/py-itsdangerous/package.py
new file mode 100644
index 0000000000..82e66c2eeb
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-itsdangerous/package.py
@@ -0,0 +1,36 @@
+##############################################################################
+# 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 PyItsdangerous(PythonPackage):
+    """Various helpers to pass trusted data to untrusted environments."""
+
+    homepage = "http://github.com/mitsuhiko/itsdangerous"
+    url = "https://pypi.io/packages/source/i/itsdangerous/itsdangerous-0.24.tar.gz"
+
+    version('0.24', 'a3d55aa79369aef5345c036a8a26307f')
+
+    depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-pbr/package.py b/var/spack/repos/builtin/packages/py-pbr/package.py
index 6bacda73f3..7036ffee8a 100644
--- a/var/spack/repos/builtin/packages/py-pbr/package.py
+++ b/var/spack/repos/builtin/packages/py-pbr/package.py
@@ -35,4 +35,6 @@ class PyPbr(PythonPackage):
     version('1.8.1', 'c8f9285e1a4ca6f9654c529b158baa3a')
 
     depends_on('py-setuptools', type='build')
+    # Only needed for py<3.4, however when='^python@:3.4.2' syntax might be
+    # broken, if this fails, remove the when-clause
     depends_on('py-enum34', type='build', when='^python@:3.3')
diff --git a/var/spack/repos/builtin/packages/py-pysocks/package.py b/var/spack/repos/builtin/packages/py-pysocks/package.py
new file mode 100644
index 0000000000..27f219c64c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pysocks/package.py
@@ -0,0 +1,37 @@
+##############################################################################
+# 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 PyPysocks(PythonPackage):
+    """A Python SOCKS client module."""
+
+    homepage = "https://github.com/Anorov/PySocks"
+    url      = "https://pypi.io/packages/source/P/PySocks/PySocks-1.6.6.tar.gz"
+
+    version('1.6.6', '571f4c23982fa86bf0e7a441f1b6c881')
+    version('1.5.7', '68f4ad7a8d4fa725656ae3e9dd142d29')
+
+    depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-pytest-cov/package.py b/var/spack/repos/builtin/packages/py-pytest-cov/package.py
new file mode 100644
index 0000000000..f40fc7872e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pytest-cov/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 PyPytestCov(PythonPackage):
+    """Pytest plugin for measuring coverage."""
+
+    homepage = "https://github.com/pytest-dev/pytest-cov"
+    url =      "https://pypi.io/packages/source/p/pytest-cov/pytest-cov-2.3.1.tar.gz"
+
+    version('2.3.1', '8e7475454313a035d08f387ee6d725cb')
+
+    extends('python', ignore=r'bin/*')
+
+    depends_on('py-setuptools',      type='build')
+    depends_on('py-pytest@2.6.0:',   type=('build', 'run'))
+    depends_on('py-coverage@3.7.1:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py b/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py
new file mode 100644
index 0000000000..2eb498987d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pytest-httpbin/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 PyPytestHttpbin(PythonPackage):
+    """Easily test your HTTP library against a local copy of httpbin"""
+
+    homepage = "https://github.com/kevin1024/pytest-httpbin"
+    url      = "https://pypi.io/packages/source/p/pytest-httpbin/pytest-httpbin-0.2.3.tar.gz"
+
+    version('0.2.3', 'b8ebb8e2fbac1a445fb5d044f7fec556')
+
+    extends('python', ignore=r'bin/flask')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('py-flask',      type=('build', 'run'))
+    depends_on('py-decorator',  type=('build', 'run'))
+    depends_on('py-httpbin',    type=('build', 'run'))
+    depends_on('py-six',        type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pytest-mock/package.py b/var/spack/repos/builtin/packages/py-pytest-mock/package.py
new file mode 100644
index 0000000000..354b799e92
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pytest-mock/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 PyPytestMock(PythonPackage):
+    """Thin-wrapper around the mock package for easier use with py.test"""
+
+    homepage = "https://github.com/pytest-dev/pytest-mock"
+    url      = "https://pypi.io/packages/source/p/pytest-mock/pytest-mock-1.2.zip"
+
+    version('1.2', 'a7fa820f7bc71698660945836ff93c73')
+
+    extends('python', ignore=r'bin/*')
+
+    depends_on('py-setuptools',  type='build')
+    depends_on('py-pytest@2.7:', type=('build', 'run'))
+    depends_on('py-mock',        type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py
new file mode 100644
index 0000000000..ca8c74d13a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-requests/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 PyRequests(PythonPackage):
+    """Python HTTP for Humans."""
+
+    homepage = "http://python-requests.org"
+    url = "https://pypi.io/packages/source/r/requests/requests-2.13.0.tar.gz"
+
+    version('2.13.0', '921ec6b48f2ddafc8bb6160957baf444')
+    version('2.11.1', 'ad5f9c47b5c5dfdb28363ad7546b0763')
+
+    depends_on('py-setuptools',              type='build')
+    # from setup.py:
+    # test_requirements = ['pytest>=2.8.0', 'pytest-httpbin'==0.0.7,
+    #                      'pytest-cov', 'pytest-mock']
+    # needs #1279 and #2869
+    # depends_on('py-pytest@2.8.7:',           type=('build', 'run'))
+    # depends_on('py-pytest-cov@2.2.1:',       type=('build', 'run'))
+    # depends_on('py-pytest-httpbin@0.2.0:',   type=('build', 'run'))
+    # depends_on('py-pytest-mock@0.11.0:',     type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-werkzeug/package.py b/var/spack/repos/builtin/packages/py-werkzeug/package.py
new file mode 100644
index 0000000000..f563b9ce19
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-werkzeug/package.py
@@ -0,0 +1,37 @@
+##############################################################################
+# 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 PyWerkzeug(PythonPackage):
+    """The Swiss Army knife of Python web development"""
+
+    homepage = "http://werkzeug.pocoo.org"
+    url      = "https://pypi.io/packages/source/W/Werkzeug/Werkzeug-0.11.11.tar.gz"
+
+    version('0.11.15', 'cb4010478dd33905f95920e4880204a2')
+    version('0.11.11', '1d34afa1f19abcef4c0da51ebc2c4ea7')
+
+    depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-wheel/package.py b/var/spack/repos/builtin/packages/py-wheel/package.py
index c95a83a965..b199f990c7 100644
--- a/var/spack/repos/builtin/packages/py-wheel/package.py
+++ b/var/spack/repos/builtin/packages/py-wheel/package.py
@@ -29,7 +29,7 @@ class PyWheel(PythonPackage):
     """A built-package format for Python."""
 
     homepage = "https://pypi.python.org/pypi/wheel"
-    url      = "https://pypi.python.org/packages/source/w/wheel/wheel-0.26.0.tar.gz"
+    url      = "https://pypi.io/packages/source/w/wheel/wheel-0.29.0.tar.gz"
 
     version('0.29.0', '555a67e4507cedee23a0deb9651e452f')
     version('0.26.0', '4cfc6e7e3dc7377d0164914623922a10')