diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py
index ce30e18f420..1f5fdfb7614 100644
--- a/lib/spack/spack/util/executable.py
+++ b/lib/spack/spack/util/executable.py
@@ -209,7 +209,7 @@ def streamify(arg, mode):
                 istream.close()
 
     def __eq__(self, other):
-        return self.exe == other.exe
+        return hasattr(other, 'exe') and self.exe == other.exe
 
     def __neq__(self, other):
         return not (self == other)
diff --git a/var/spack/repos/builtin/packages/py-backports-weakref/package.py b/var/spack/repos/builtin/packages/py-backports-weakref/package.py
index b3e5ad65bca..ef88d792566 100644
--- a/var/spack/repos/builtin/packages/py-backports-weakref/package.py
+++ b/var/spack/repos/builtin/packages/py-backports-weakref/package.py
@@ -10,7 +10,7 @@ class PyBackportsWeakref(PythonPackage):
     """Backports of new features in Python's weakref module"""
 
     homepage = "https://github.com/PiDelport/backports.weakref"
-    url      = "https://pypi.org/packages/source/b/backports.weakref/backports.weakref-1.0.post1.tar.gz"
+    url      = "https://pypi.io/packages/source/b/backports.weakref/backports.weakref-1.0.post1.tar.gz"
 
     version('1.0.post1', sha256='bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2', preferred=True)
     version('1.0rc1', sha256='8813bf712a66b3d8b85dc289e1104ed220f1878cf981e2fe756dfaabe9a82892')
diff --git a/var/spack/repos/builtin/packages/py-colorlog/package.py b/var/spack/repos/builtin/packages/py-colorlog/package.py
index 7eb42c2976a..05268384f29 100644
--- a/var/spack/repos/builtin/packages/py-colorlog/package.py
+++ b/var/spack/repos/builtin/packages/py-colorlog/package.py
@@ -10,7 +10,7 @@ class PyColorlog(PythonPackage):
     """A colored formatter for the python logging module"""
 
     homepage = "https://github.com/borntyping/python-colorlog"
-    url      = "https://pypi.org/packages/source/c/colorlog/colorlog-4.0.2.tar.gz"
+    url      = "https://pypi.io/packages/source/c/colorlog/colorlog-4.0.2.tar.gz"
 
     version('4.0.2', sha256='3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42')
     version('3.1.4', sha256='418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d')
diff --git a/var/spack/repos/builtin/packages/py-colorpy/package.py b/var/spack/repos/builtin/packages/py-colorpy/package.py
index da11077eaf3..909ad673efc 100644
--- a/var/spack/repos/builtin/packages/py-colorpy/package.py
+++ b/var/spack/repos/builtin/packages/py-colorpy/package.py
@@ -15,7 +15,7 @@ class PyColorpy(PythonPackage):
     """
 
     homepage = "http://markkness.net/colorpy/ColorPy.html"
-    url      = "https://pypi.org/packages/source/c/colorpy/colorpy-0.1.1.tar.gz"
+    url      = "https://pypi.io/packages/source/c/colorpy/colorpy-0.1.1.tar.gz"
 
     version('0.1.1', sha256='e400a7e879adc83c6098dde13cdd093723f3936778c245b1caf88f5f1411170d')
 
diff --git a/var/spack/repos/builtin/packages/py-ecdsa/package.py b/var/spack/repos/builtin/packages/py-ecdsa/package.py
index 18d6d7eddbf..2401b9bd276 100644
--- a/var/spack/repos/builtin/packages/py-ecdsa/package.py
+++ b/var/spack/repos/builtin/packages/py-ecdsa/package.py
@@ -10,11 +10,12 @@ class PyEcdsa(PythonPackage):
     """ECDSA cryptographic signature library (pure python)"""
 
     homepage = "https://github.com/warner/python-ecdsa"
-    url      = "https://files.pythonhosted.org/packages/source/e/ecdsa/ecdsa-0.13.2.tar.gz"
+    url      = "https://pypi.io/packages/source/e/ecdsa/ecdsa-0.15.tar.gz"
 
+    version('0.15',   sha256='8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277')
     version('0.13.2', sha256='5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884')
 
-    depends_on('py-setuptools', type='build')
-    depends_on('py-six',        type=('build', 'run'))
     depends_on('python@2.6:2.8,3.3:', type=('build', 'run'))
+    depends_on('py-setuptools', type='build')
+    depends_on('py-six@1.9.0:', type=('build', 'run'))
     depends_on('openssl',       type='test')
diff --git a/var/spack/repos/builtin/packages/py-exodus-bundler/package.py b/var/spack/repos/builtin/packages/py-exodus-bundler/package.py
index b14570f54b5..c13f30eb469 100644
--- a/var/spack/repos/builtin/packages/py-exodus-bundler/package.py
+++ b/var/spack/repos/builtin/packages/py-exodus-bundler/package.py
@@ -11,7 +11,7 @@ class PyExodusBundler(PythonPackage):
     ELF binaries from one system to another."""
 
     homepage = "https://github.com/intoli/exodus"
-    url      = "https://pypi.org/packages/source/e/exodus-bundler/exodus-bundler-2.0.2.tar.gz"
+    url      = "https://pypi.io/packages/source/e/exodus-bundler/exodus-bundler-2.0.2.tar.gz"
 
     version('2.0.2', sha256='4e896a2034b94cf7b4fb33d86a68e29a7d3b08e57541e444db34dddc6ac1ef68')
 
diff --git a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py
index 8de1f375051..cc61a2e936b 100644
--- a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py
+++ b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py
@@ -11,10 +11,10 @@ class PyFlake8Polyfill(PythonPackage):
        for Flake8 plugins that intend to support Flake8 2.x and 3.x
        simultaneously.
     """
-    homepage = "https://pypi.org/project/flake8-polyfill/"
-    url      = "https://files.pythonhosted.org/packages/e6/67/1c26634a770db5c442e361311bee73cb3a177adb2eb3f7af8953cfd9f553/flake8-polyfill-1.0.2.tar.gz"
+    homepage = "https://gitlab.com/pycqa/flake8-polyfill"
+    url      = "https://pypi.io/packages/source/f/flake8-polyfill/flake8-polyfill-1.0.2.tar.gz"
 
     version('1.0.2', sha256='e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda')
 
-    extends('python', ignore='bin/(flake8|pyflakes|pycodestyle)')
-    depends_on('py-flake8', type='run')
+    depends_on('py-setuptools', type='build')
+    depends_on('py-flake8', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-gensim/package.py b/var/spack/repos/builtin/packages/py-gensim/package.py
index 06eaacfe945..a08cbbe98d1 100644
--- a/var/spack/repos/builtin/packages/py-gensim/package.py
+++ b/var/spack/repos/builtin/packages/py-gensim/package.py
@@ -8,21 +8,20 @@
 
 class PyGensim(PythonPackage):
     """Gensim is a Python library for topic modelling, document indexing and
-       similarity retrieval with large corpora. Target audience is the natural
-       language processing (NLP) and information retrieval (IR) community."""
+    similarity retrieval with large corpora. Target audience is the natural
+    language processing (NLP) and information retrieval (IR) community."""
 
-    homepage = "https://pypi.org/project/gensim/"
-    url      = "https://files.pythonhosted.org/packages/3a/bc/1415be59292a23ff123298b4b46ec4be80b3bfe72c8d188b58ab2653dee4/gensim-3.8.0.tar.gz"
+    homepage = "https://radimrehurek.com/gensim"
+    url      = "https://pypi.io/packages/source/g/gensim/gensim-3.8.1.tar.gz"
 
-    version('3.8.1', sha256='33277fc0a8d7b0c7ce70fcc74bb82ad39f944c009b334856c6e86bf552b1dfdc',
-            url='https://files.pythonhosted.org/packages/73/f2/e9af000df6419bf1a63ffed3e6033a1b1d8fcf2f971fcdac15296619aff8/gensim-3.8.1.tar.gz')
+    maintainers = ['adamjstewart']
+
+    version('3.8.1', sha256='33277fc0a8d7b0c7ce70fcc74bb82ad39f944c009b334856c6e86bf552b1dfdc')
     version('3.8.0', sha256='ec5de7ff2bfa8692fa96a846bb5aae52f267fc322fbbe303c1f042d258af5766')
 
-    depends_on('python@3.5:', type=('build', 'run'))
-
+    depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
-
-    depends_on('py-numpy', type=('build', 'run'))
-    depends_on('py-scipy', type=('build', 'run'))
-    depends_on('py-smart-open', type=('build', 'run'))
-    depends_on('py-six', type=('build', 'run'))
+    depends_on('py-numpy@1.11.3:', type=('build', 'run'))
+    depends_on('py-scipy@0.18.1:', type=('build', 'run'))
+    depends_on('py-six@1.5.0:', type=('build', 'run'))
+    depends_on('py-smart-open@1.8.1:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-hdfs/package.py b/var/spack/repos/builtin/packages/py-hdfs/package.py
index 599a00fad8f..c84c3faca92 100644
--- a/var/spack/repos/builtin/packages/py-hdfs/package.py
+++ b/var/spack/repos/builtin/packages/py-hdfs/package.py
@@ -9,7 +9,7 @@
 class PyHdfs(PythonPackage):
     """API and command line interface for HDFS"""
     homepage = "https://hdfscli.readthedocs.io/en/latest/"
-    url      = "https://pypi.org/packages/source/h/hdfs/hdfs-2.1.0.tar.gz"
+    url      = "https://pypi.io/packages/source/h/hdfs/hdfs-2.1.0.tar.gz"
 
     version('2.1.0', sha256='a40fe99ccb03b5c3247b33a4110eb21b57405dd7c3f1b775e362e66c19b44bc6')
 
diff --git a/var/spack/repos/builtin/packages/py-humanfriendly/package.py b/var/spack/repos/builtin/packages/py-humanfriendly/package.py
index a1b63e82332..c023e2e41bf 100644
--- a/var/spack/repos/builtin/packages/py-humanfriendly/package.py
+++ b/var/spack/repos/builtin/packages/py-humanfriendly/package.py
@@ -8,9 +8,12 @@
 class PyHumanfriendly(PythonPackage):
     """Human friendly output for text interfaces using Python"""
 
-    homepage = "https://pypi.org/project/humanfriendly/"
-    url      = "https://files.pythonhosted.org/packages/26/71/e7daf57e819a70228568ff5395fdbc4de81b63067b93167e07825fcf0bcf/humanfriendly-4.18.tar.gz"
+    homepage = "https://humanfriendly.readthedocs.io/"
+    url      = "https://pypi.io/packages/source/h/humanfriendly/humanfriendly-8.1.tar.gz"
 
+    version('8.1',  sha256='25c2108a45cfd1e8fbe9cdb30b825d34ef5d5675c8e11e4775c9aedbfb0bdee2')
     version('4.18', sha256='33ee8ceb63f1db61cce8b5c800c531e1a61023ac5488ccde2ba574a85be00a85')
 
+    depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
+    depends_on('py-monotonic', when='^python@:2', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-jprops/package.py b/var/spack/repos/builtin/packages/py-jprops/package.py
index 16fed619ddd..2e6749077f3 100644
--- a/var/spack/repos/builtin/packages/py-jprops/package.py
+++ b/var/spack/repos/builtin/packages/py-jprops/package.py
@@ -10,7 +10,7 @@ class PyJprops(PythonPackage):
     """Java properties file parser for Python"""
 
     homepage = "https://github.com/mgood/jprops/"
-    url      = "https://pypi.org/packages/source/j/jprops/jprops-2.0.2.tar.gz"
+    url      = "https://pypi.io/packages/source/j/jprops/jprops-2.0.2.tar.gz"
 
     version('2.0.2', sha256='d297231833b6cd0a3f982a48fe148a7f9817f2895661743d166b267e4d3d5b2c')
 
diff --git a/var/spack/repos/builtin/packages/py-pep8-naming/package.py b/var/spack/repos/builtin/packages/py-pep8-naming/package.py
index ed123b773d1..fe3e929996c 100644
--- a/var/spack/repos/builtin/packages/py-pep8-naming/package.py
+++ b/var/spack/repos/builtin/packages/py-pep8-naming/package.py
@@ -9,10 +9,11 @@
 class PyPep8Naming(PythonPackage):
     """Check PEP-8 naming conventions, plugin for flake8."""
 
-    homepage = "https://pypi.org/project/pep8-naming/"
-    url      = "https://files.pythonhosted.org/packages/3e/4a/125425d6b1e017f48dfc9c961f4bb9510168db7a090618906c750184ed03/pep8-naming-0.7.0.tar.gz"
+    homepage = "https://github.com/PyCQA/pep8-naming"
+    url      = "https://pypi.io/packages/source/p/pep8-naming/pep8-naming-0.10.0.tar.gz"
 
-    extends('python', ignore='bin/(flake8|pyflakes|pycodestyle)')
-    version('0.7.0', sha256='624258e0dd06ef32a9daf3c36cc925ff7314da7233209c5b01f7e5cdd3c34826')
+    version('0.10.0', sha256='f3b4a5f9dd72b991bf7d8e2a341d2e1aa3a884a769b5aaac4f56825c1763bf3a')
+    version('0.7.0',  sha256='624258e0dd06ef32a9daf3c36cc925ff7314da7233209c5b01f7e5cdd3c34826')
 
-    depends_on('py-flake8-polyfill', type='run')
+    depends_on('py-setuptools', type='build')
+    depends_on('py-flake8-polyfill@1.0.2:1.999', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-progress/package.py b/var/spack/repos/builtin/packages/py-progress/package.py
index 3ae16e5e59e..cff57e9f779 100644
--- a/var/spack/repos/builtin/packages/py-progress/package.py
+++ b/var/spack/repos/builtin/packages/py-progress/package.py
@@ -10,7 +10,7 @@ class PyProgress(PythonPackage):
     """Easy progress reporting for Python"""
 
     homepage = "https://github.com/verigak/progress/"
-    url      = "https://pypi.org/packages/source/p/progress/progress-1.4.tar.gz"
+    url      = "https://pypi.io/packages/source/p/progress/progress-1.4.tar.gz"
 
     version('1.4', sha256='5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a')
 
diff --git a/var/spack/repos/builtin/packages/py-progressbar2/package.py b/var/spack/repos/builtin/packages/py-progressbar2/package.py
index 31f2688a570..196d3035916 100644
--- a/var/spack/repos/builtin/packages/py-progressbar2/package.py
+++ b/var/spack/repos/builtin/packages/py-progressbar2/package.py
@@ -11,10 +11,11 @@ class PyProgressbar2(PythonPackage):
     """A progress bar for Python 2 and Python 3"""
 
     homepage = "https://github.com/WoLpH/python-progressbar"
-    url      = "https://files.pythonhosted.org/packages/source/p/progressbar2/progressbar2-3.39.3.tar.gz"
+    url      = "https://pypi.io/packages/source/p/progressbar2/progressbar2-3.50.1.tar.gz"
 
+    version('3.50.1', sha256='2c21c14482016162852c8265da03886c2b4dea6f84e5a817ad9b39f6bd82a772')
     version('3.39.3', sha256='8e5b5419e04193bb7c3fea71579937bbbcd64c26472b929718c2fe7ec420fe39')
 
     depends_on('py-setuptools', type='build')
     depends_on('py-six', type=('build', 'run'))
-    depends_on('py-python-utils', type=('build', 'run'))
+    depends_on('py-python-utils@2.3.0:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pyarrow/package.py b/var/spack/repos/builtin/packages/py-pyarrow/package.py
index ed104821453..4daa0e00614 100644
--- a/var/spack/repos/builtin/packages/py-pyarrow/package.py
+++ b/var/spack/repos/builtin/packages/py-pyarrow/package.py
@@ -13,7 +13,7 @@ class PyPyarrow(PythonPackage):
     """
 
     homepage = "http://arrow.apache.org"
-    url = 'https://pypi.org/packages/source/p/pyarrow/pyarrow-0.15.1.tar.gz'
+    url = 'https://pypi.io/packages/source/p/pyarrow/pyarrow-0.15.1.tar.gz'
 
     version('0.15.1', sha256='7ad074690ba38313067bf3bbda1258966d38e2037c035d08b9ffe3cce07747a5')
     version('0.12.1', sha256='10db6e486c918c3af999d0114a22d92770687e3a6607ea3f14e6748854824c2a')
diff --git a/var/spack/repos/builtin/packages/py-pyspark/package.py b/var/spack/repos/builtin/packages/py-pyspark/package.py
index 15285d3c304..7a7cf1d286a 100644
--- a/var/spack/repos/builtin/packages/py-pyspark/package.py
+++ b/var/spack/repos/builtin/packages/py-pyspark/package.py
@@ -10,7 +10,7 @@ class PyPyspark(PythonPackage):
     """Python bindings for Apache Spark"""
 
     homepage = "http://spark.apache.org"
-    url      = "https://pypi.org/packages/source/p/pyspark/pyspark-2.3.0.tar.gz"
+    url      = "https://pypi.io/packages/source/p/pyspark/pyspark-2.3.0.tar.gz"
 
     version('2.3.0', sha256='0b3536910e154c36a94239f0ba0a201f476aadc72006409e5787198ffd01986e')
 
diff --git a/var/spack/repos/builtin/packages/py-python-utils/package.py b/var/spack/repos/builtin/packages/py-python-utils/package.py
index bc6057a0780..6c8e3aa732d 100644
--- a/var/spack/repos/builtin/packages/py-python-utils/package.py
+++ b/var/spack/repos/builtin/packages/py-python-utils/package.py
@@ -12,8 +12,12 @@ class PyPythonUtils(PythonPackage):
     which make common patterns shorter and easier."""
 
     homepage = "https://github.com/WoLpH/python-utils"
-    url      = "https://files.pythonhosted.org/packages/source/p/python-utils/python-utils-2.3.0.tar.gz"
+    url      = "https://pypi.io/packages/source/p/python-utils/python-utils-2.4.0.tar.gz"
 
+    version('2.4.0', sha256='f21fc09ff58ea5ebd1fd2e8ef7f63e39d456336900f26bdc9334a03a3f7d8089')
     version('2.3.0', sha256='34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3')
 
     depends_on('py-setuptools', type='build')
+    depends_on('py-six', type=('build', 'run'))
+    depends_on('py-pytest', type='test')
+    depends_on('py-pytest-runner', type='test')
diff --git a/var/spack/repos/builtin/packages/py-requests-futures/package.py b/var/spack/repos/builtin/packages/py-requests-futures/package.py
index 4c79bcf871a..a11d577e1cc 100644
--- a/var/spack/repos/builtin/packages/py-requests-futures/package.py
+++ b/var/spack/repos/builtin/packages/py-requests-futures/package.py
@@ -10,7 +10,7 @@ class PyRequestsFutures(PythonPackage):
     """Asynchronous Python HTTP Requests for Humans using Futures"""
 
     homepage = "https://github.com/ross/requests-futures"
-    url      = "https://pypi.org/packages/source/r/requests-futures/requests-futures-1.0.0.tar.gz"
+    url      = "https://pypi.io/packages/source/r/requests-futures/requests-futures-1.0.0.tar.gz"
 
     version('1.0.0', sha256='35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148')
 
diff --git a/var/spack/repos/builtin/packages/py-scoop/package.py b/var/spack/repos/builtin/packages/py-scoop/package.py
index 2fc309bbd63..e1e25abd019 100644
--- a/var/spack/repos/builtin/packages/py-scoop/package.py
+++ b/var/spack/repos/builtin/packages/py-scoop/package.py
@@ -13,10 +13,11 @@ class PyScoop(PythonPackage):
     environments, from heterogeneous grids to supercomputers."""
 
     homepage = "https://github.com/soravux/scoop"
-    url      = "https://files.pythonhosted.org/packages/source/s/scoop/scoop-0.7.1.1.tar.gz"
+    url      = "https://pypi.io/packages/source/s/scoop/scoop-0.7.1.1.tar.gz"
 
     version('0.7.1.1', sha256='d8b6444c7bac901171e3327a97e241dde63f060354e162a65551fd8083ca62b4')
 
     depends_on('py-setuptools', type='build')
     depends_on('py-greenlet@0.3.4:', type=('build', 'run'))
     depends_on('py-pyzmq@13.1.0:', type=('build', 'run'))
+    depends_on('py-argparse@1.1:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py
index 550b503e6c8..5aed1f39eb7 100644
--- a/var/spack/repos/builtin/packages/py-sphinx/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinx/package.py
@@ -10,7 +10,7 @@ class PySphinx(PythonPackage):
     """Sphinx Documentation Generator."""
 
     homepage = "http://sphinx-doc.org"
-    url      = "https://pypi.io/packages/source/S/Sphinx/Sphinx-2.2.0.tar.gz"
+    url      = "https://pypi.io/packages/source/S/Sphinx/Sphinx-3.0.0.tar.gz"
 
     import_modules = [
         'sphinx', 'sphinx.testing', 'sphinx.ext', 'sphinx.pycode',
@@ -22,6 +22,7 @@ class PySphinx(PythonPackage):
         'sphinx.environment.collectors', 'sphinx.environment.adapters'
     ]
 
+    version('3.0.0', sha256='6a099e6faffdc3ceba99ca8c2d09982d43022245e409249375edf111caf79ed3')
     version('2.2.0', sha256='0d586b0f8c2fc3cc6559c5e8fd6124628110514fda0e5d7c82e682d749d2e845')
     version('1.8.4', sha256='c1c00fc4f6e8b101a0d037065043460dffc2d507257f2f11acaed71fd2b0c83c')
     version('1.8.2', sha256='120732cbddb1b2364471c3d9f8bfd4b0c5b550862f99a65736c77f970b142aea')
diff --git a/var/spack/repos/builtin/packages/py-tblib/package.py b/var/spack/repos/builtin/packages/py-tblib/package.py
index 5234fde4e04..f32e292c125 100644
--- a/var/spack/repos/builtin/packages/py-tblib/package.py
+++ b/var/spack/repos/builtin/packages/py-tblib/package.py
@@ -11,8 +11,10 @@ class PyTblib(PythonPackage):
     """Traceback fiddling library. Allows you to pickle tracebacks."""
 
     homepage = "https://github.com/ionelmc/python-tblib"
-    url      = "https://files.pythonhosted.org/packages/source/t/tblib/tblib-1.4.0.tar.gz"
+    url      = "https://pypi.io/packages/source/t/tblib/tblib-1.6.0.tar.gz"
 
+    version('1.6.0', sha256='229bee3754cb5d98b4837dd5c4405e80cfab57cb9f93220410ad367f8b352344')
     version('1.4.0', sha256='bd1ad564564a158ff62c290687f3db446038f9ac11a0bf6892712e3601af3bcd')
 
+    depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-testinfra/package.py b/var/spack/repos/builtin/packages/py-testinfra/package.py
index bae58db30df..40e7cd440cf 100644
--- a/var/spack/repos/builtin/packages/py-testinfra/package.py
+++ b/var/spack/repos/builtin/packages/py-testinfra/package.py
@@ -12,7 +12,7 @@ class PyTestinfra(PythonPackage):
     Chef and so on."""
 
     homepage = "https://testinfra.readthedocs.io"
-    url      = "https://pypi.python.org/packages/source/t/testinfra/testinfra-1.11.1.tar.gz"
+    url      = "https://pypi.io/packages/source/t/testinfra/testinfra-1.11.1.tar.gz"
 
     version('1.18.0', sha256='4a0a70355b007729d78446c86bffd80bcea4ffe9adc9571f9c9779476c49153d')
     version('1.13.0', sha256='b5afa23d71ee49ad81aed104e4a0f1c02819ef791291cd308fe27aa7f3d3b01f')
diff --git a/var/spack/repos/builtin/packages/py-usgs/package.py b/var/spack/repos/builtin/packages/py-usgs/package.py
index 14d20b62cd4..69f2b970563 100644
--- a/var/spack/repos/builtin/packages/py-usgs/package.py
+++ b/var/spack/repos/builtin/packages/py-usgs/package.py
@@ -10,7 +10,9 @@ class PyUsgs(PythonPackage):
     """Client library for interfacing with USGS datasets"""
 
     homepage = "https://github.com/kapadia/usgs"
-    url      = "https://pypi.org/packages/source/u/usgs/usgs-0.2.7.tar.gz"
+    url      = "https://pypi.io/packages/source/u/usgs/usgs-0.2.7.tar.gz"
+
+    maintainers = ['adamjstewart']
 
     version('0.2.7', sha256='484e569ea1baf9574e11ccf15219957364690dcf06ee3d09afef030df944e79b')
 
diff --git a/var/spack/repos/builtin/packages/py-uwsgi/package.py b/var/spack/repos/builtin/packages/py-uwsgi/package.py
index aed1882b045..fdc990d48d1 100644
--- a/var/spack/repos/builtin/packages/py-uwsgi/package.py
+++ b/var/spack/repos/builtin/packages/py-uwsgi/package.py
@@ -11,7 +11,7 @@ class PyUwsgi(PythonPackage):
     """Web Application framework for low overhead web services"""
 
     homepage = "https://github.com/unbit/uwsgi/"
-    url      = "https://pypi.org/packages/source/u/uwsgi/uwsgi-2.0.18.tar.gz"
+    url      = "https://pypi.io/packages/source/u/uwsgi/uwsgi-2.0.18.tar.gz"
 
     version('2.0.18', sha256='4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583')