PythonPackage: url -> pypi (#20610)

* Convert all `url` attributes in `PythonPackage`s to `pypi` attributes
* add `pypi =` to flake8 exceptions

share/spack/qa/flake8_formatter.py

@@ -27,6 +27,7 @@
             r"^\s*git\s*=",
             r"^\s*svn\s*=",
             r"^\s*hg\s*=",
+            r"^\s*pypi\s*=",
             r"^\s*list_url\s*=",
             r"^\s*version\(",
             r"^\s*variant\(",

var/spack/repos/builtin/packages/aws-parallelcluster/package.py

@@ -12,7 +12,7 @@ class AwsParallelcluster(PythonPackage):
     tool to deploy and manage HPC clusters in the AWS cloud."""
 
     homepage = "https://github.com/aws/aws-parallelcluster"
-    url      = "https://pypi.io/packages/source/a/aws-parallelcluster/aws-parallelcluster-2.10.1.tar.gz"
+    pypi = "aws-parallelcluster/aws-parallelcluster-2.10.1.tar.gz"
 
     maintainers = [
         'sean-smith', 'demartinofra', 'enrico-usai', 'lukeseawalker', 'rexcsn',

var/spack/repos/builtin/packages/awscli/package.py

@@ -11,8 +11,7 @@ class Awscli(PythonPackage):
     """This package provides a unified command line interface to
        Amazon Web Services"""
 
-    homepage = "https://pypi.org/project/awscli/"
+    pypi = "awscli/awscli-1.16.308.tar.gz"
-    url      = "https://pypi.io/packages/source/a/awscli/awscli-1.16.308.tar.gz"
 
     version('1.16.308', sha256='3632fb1db2538128509a7b5e89f2a2c4ea3426bec139944247bddc4d79bf7603')
     version('1.16.179', sha256='6a87114d1325358d000abe22b2103baae7b91f053ff245b9fde33cb0affb5e4f')

var/spack/repos/builtin/packages/bumpversion/package.py

@@ -9,8 +9,7 @@
 class Bumpversion(PythonPackage):
     """Version-bump your software with a single command."""
 
-    homepage = "https://pypi.python.org/pypi/bumpversion"
+    pypi = "bumpversion/bumpversion-0.5.0.tar.gz"
-    url      = "https://pypi.io/packages/source/b/bumpversion/bumpversion-0.5.0.tar.gz"
 
     version('0.5.3', sha256='6744c873dd7aafc24453d8b6a1a0d6d109faf63cd0cd19cb78fd46e74932c77e')
     version('0.5.0', sha256='030832b9b46848e1c1ac6678dba8242a021e35e908b65565800c9650291117dc')

var/spack/repos/builtin/packages/cget/package.py

@@ -10,7 +10,7 @@ class Cget(PythonPackage):
     """Cmake package retrieval."""
 
     homepage = "https://github.com/pfultz2/cget"
-    url      = "https://pypi.io/packages/source/c/cget/cget-0.1.9.tar.gz"
+    pypi = "cget/cget-0.1.9.tar.gz"
 
     version('0.1.9', sha256='2a7913b601bec615208585eda7e69998a43cc17080d36c2ff2ce8742c9794bf6')
 

var/spack/repos/builtin/packages/easybuild/package.py

@@ -12,7 +12,7 @@ class Easybuild(PythonPackage):
     """
 
     homepage = 'https://easybuilders.github.io/easybuild/'
-    url      = 'https://pypi.io/packages/source/e/easybuild/easybuild-4.0.0.tar.gz'
+    pypi = 'easybuild/easybuild-4.0.0.tar.gz'
     maintainers = ['boegel']
 
     version('4.0.0', sha256='21bcc1048525ad6219667cc97a7421b5388068c670cabba356712e474896de40')

var/spack/repos/builtin/packages/httpie/package.py

@@ -10,7 +10,7 @@ class Httpie(PythonPackage):
     """Modern command line HTTP client."""
 
     homepage = "https://httpie.org/"
-    url      = "https://pypi.io/packages/source/h/httpie/httpie-0.9.8.tar.gz"
+    pypi = "httpie/httpie-0.9.8.tar.gz"
 
     version('0.9.9', sha256='f1202e6fa60367e2265284a53f35bfa5917119592c2ab08277efc7fffd744fcb')
     version('0.9.8', sha256='515870b15231530f56fe2164190581748e8799b66ef0fe36ec9da3396f0df6e1')

var/spack/repos/builtin/packages/py-3to2/package.py

@@ -10,7 +10,6 @@ class Py3to2(PythonPackage):
     """lib3to2 is a set of fixers that are intended to backport code written
     for Python version 3.x into Python version 2.x."""
 
-    homepage = "https://pypi.python.org/pypi/3to2"
+    pypi = "3to2/3to2-1.1.1.zip"
-    url      = "https://pypi.io/packages/source/3/3to2/3to2-1.1.1.zip"
 
     version('1.1.1', sha256='fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c')

var/spack/repos/builtin/packages/py-4suite-xml/package.py

@@ -11,7 +11,7 @@ class Py4suiteXml(PythonPackage):
     XLink, XUpdate"""
 
     homepage = "http://4suite.org/"
-    url      = "https://pypi.io/packages/source/4/4Suite-XML/4Suite-XML-1.0.2.tar.gz"
+    pypi = "4Suite-XML/4Suite-XML-1.0.2.tar.gz"
 
     version('1.0.2', sha256='f0c24132eb2567e64b33568abff29a780a2f0236154074d0b8f5262ce89d8c03')
 

var/spack/repos/builtin/packages/py-abipy/package.py

@@ -11,7 +11,7 @@ class PyAbipy(PythonPackage):
     the results."""
 
     homepage = "https://github.com/abinit/abipy"
-    url      = "https://pypi.io/packages/source/a/abipy/abipy-0.2.0.tar.gz"
+    pypi = "abipy/abipy-0.2.0.tar.gz"
 
     version('0.2.0', sha256='c72b796ba0f9ea4299eac3085bede092d2652e9e5e8074d3badd19ef7b600792')
 

var/spack/repos/builtin/packages/py-absl-py/package.py

@@ -14,8 +14,7 @@ class PyAbslPy(PythonPackage):
     extensively tested and used in production.
     """
 
-    homepage = "https://pypi.org/project/absl-py/"
+    pypi = "absl-py/absl-py-0.7.0.tar.gz"
-    url      = "https://pypi.io/packages/source/a/absl-py/absl-py-0.7.0.tar.gz"
 
     version('0.7.1', sha256='b943d1c567743ed0455878fcd60bc28ac9fae38d129d1ccfad58079da00b8951')
     version('0.7.0', sha256='8718189e4bd6013bf79910b9d1cb0a76aecad8ce664f78e1144980fabdd2cd23')

var/spack/repos/builtin/packages/py-adal/package.py

@@ -12,7 +12,7 @@ class PyAdal(PythonPackage):
     DEPRECATED: replaced by MSAL Python."""
 
     homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python"
-    url      = "https://pypi.io/packages/source/a/adal/adal-1.2.4.tar.gz"
+    pypi = "adal/adal-1.2.4.tar.gz"
 
     version('1.2.4', sha256='7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0')
 

var/spack/repos/builtin/packages/py-advancedhtmlparser/package.py

@@ -12,7 +12,7 @@ class PyAdvancedhtmlparser(PythonPackage):
     modification, and formatting"""
 
     homepage = "https://github.com/kata198/AdvancedHTMLParser"
-    url      = "https://pypi.io/packages/source/a/advancedhtmlparser/AdvancedHTMLParser-8.1.4.tar.gz"
+    pypi = "advancedhtmlparser/AdvancedHTMLParser-8.1.4.tar.gz"
 
     version('8.1.4', sha256='21a73137026c8ec3248c654a24cc40064196029256cdf71681149f6835e9ed39')
 

var/spack/repos/builtin/packages/py-aenum/package.py

@@ -11,7 +11,7 @@ class PyAenum(PythonPackage):
     NamedTuples, and NamedConstants."""
 
     homepage = "https://bitbucket.org/stoneleaf/aenum"
-    url      = "https://pypi.io/packages/source/a/aenum/aenum-2.1.2.tar.gz"
+    pypi = "aenum/aenum-2.1.2.tar.gz"
 
     version('2.1.2', sha256='a3208e4b28db3a7b232ff69b934aef2ea1bf27286d9978e1e597d46f490e4687')
 

var/spack/repos/builtin/packages/py-agate-dbf/package.py

@@ -10,7 +10,7 @@ class PyAgateDbf(PythonPackage):
     """agate-dbf adds read support for dbf files to agate."""
 
     homepage = "https://agate-dbf.readthedocs.io/en/latest/"
-    url      = "https://pypi.io/packages/source/a/agate-dbf/agate-dbf-0.2.1.tar.gz"
+    pypi = "agate-dbf/agate-dbf-0.2.1.tar.gz"
 
     version('0.2.1', sha256='00c93c498ec9a04cc587bf63dd7340e67e2541f0df4c9a7259d7cb3dd4ce372f')
 

var/spack/repos/builtin/packages/py-agate-excel/package.py

@@ -11,7 +11,7 @@ class PyAgateExcel(PythonPackage):
     agate."""
 
     homepage = "https://agate-excel.readthedocs.io/en/latest/"
-    url      = "https://pypi.io/packages/source/a/agate-excel/agate-excel-0.2.3.tar.gz"
+    pypi = "agate-excel/agate-excel-0.2.3.tar.gz"
 
     version('0.2.3', sha256='8f255ef2c87c436b7132049e1dd86c8e08bf82d8c773aea86f3069b461a17d52')
 

var/spack/repos/builtin/packages/py-agate-sql/package.py

@@ -10,7 +10,7 @@ class PyAgateSql(PythonPackage):
     """agate-sql adds SQL read/write support to agate."""
 
     homepage = "https://agate-sql.readthedocs.io/en/latest/"
-    url      = "https://pypi.io/packages/source/a/agate-sql/agate-sql-0.5.4.tar.gz"
+    pypi = "agate-sql/agate-sql-0.5.4.tar.gz"
 
     version('0.5.4', sha256='9277490ba8b8e7c747a9ae3671f52fe486784b48d4a14e78ca197fb0e36f281b')
 

var/spack/repos/builtin/packages/py-agate/package.py

@@ -12,7 +12,7 @@ class PyAgate(PythonPackage):
     real-world problems with readable code."""
 
     homepage = "https://agate.readthedocs.io/en/latest/"
-    url      = "https://pypi.io/packages/source/a/agate/agate-1.6.1.tar.gz"
+    pypi = "agate/agate-1.6.1.tar.gz"
 
     version('1.6.1', sha256='c93aaa500b439d71e4a5cf088d0006d2ce2c76f1950960c8843114e5f361dfd3')
 

var/spack/repos/builtin/packages/py-aiofiles/package.py

@@ -11,7 +11,7 @@ class PyAiofiles(PythonPackage):
     handling local disk files in asyncio applications."""
 
     homepage = "https://github.com/Tinche/aiofiles"
-    url      = "https://pypi.io/packages/source/a/aiofiles/aiofiles-0.5.0.tar.gz"
+    pypi = "aiofiles/aiofiles-0.5.0.tar.gz"
 
     version('0.5.0', sha256='98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af')
 

var/spack/repos/builtin/packages/py-aiohttp-cors/package.py

@@ -9,7 +9,7 @@ class PyAiohttpCors(PythonPackage):
     support for aiohttp asyncio-powered asynchronous HTTP server."""
 
     homepage = "https://github.com/aio-libs/aiohttp-cors"
-    url      = "https://pypi.io/packages/source/a/aiohttp_cors/aiohttp-cors-0.7.0.tar.gz"
+    pypi = "aiohttp_cors/aiohttp-cors-0.7.0.tar.gz"
 
     version('0.7.0', sha256='4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d')
 

var/spack/repos/builtin/packages/py-aioredis/package.py

@@ -8,7 +8,7 @@ class PyAioredis(PythonPackage):
     """asyncio (PEP 3156) Redis support."""
 
     homepage = "https://github.com/aio-libs/aioredis"
-    url      = "https://pypi.io/packages/source/a/aioredis/aioredis-1.3.1.tar.gz"
+    pypi = "aioredis/aioredis-1.3.1.tar.gz"
 
     version('1.3.1', sha256='15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a')
 

var/spack/repos/builtin/packages/py-alabaster/package.py

@@ -11,7 +11,7 @@ class PyAlabaster(PythonPackage):
     for the Sphinx documentation system."""
 
     homepage = "https://alabaster.readthedocs.io/"
-    url      = "https://pypi.io/packages/source/a/alabaster/alabaster-0.7.10.tar.gz"
+    pypi = "alabaster/alabaster-0.7.10.tar.gz"
 
     version('0.7.12', sha256='a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02')
     version('0.7.10', sha256='37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0')

var/spack/repos/builtin/packages/py-alembic/package.py

@@ -9,8 +9,7 @@
 class PyAlembic(PythonPackage):
     """Alembic is a database migrations tool."""
 
-    homepage = "https://pypi.org/project/alembic/"
+    pypi = "alembic/alembic-1.0.7.tar.gz"
-    url      = "https://pypi.io/packages/source/a/alembic/alembic-1.0.7.tar.gz"
 
     version('1.0.7', sha256='16505782b229007ae905ef9e0ae6e880fddafa406f086ac7d442c1aaf712f8c2')
 

var/spack/repos/builtin/packages/py-altgraph/package.py

@@ -13,8 +13,7 @@ class PyAltgraph(PythonPackage):
       topological sort, shortest paths, etc. with graphviz output.
     """
 
-    homepage = "https://pypi.python.org/pypi/altgraph"
+    pypi = "altgraph/altgraph-0.16.1.tar.gz"
-    url = "https://pypi.io/packages/source/a/altgraph/altgraph-0.16.1.tar.gz"
 
     version('0.16.1', "ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c")
 

var/spack/repos/builtin/packages/py-amqp/package.py

@@ -9,8 +9,7 @@
 class PyAmqp(PythonPackage):
     """Low-level AMQP client for Python (fork of amqplib)."""
 
-    homepage = "https://pypi.org/project/amqp/"
+    pypi = "amqp/amqp-2.4.1.tar.gz"
-    url      = "https://pypi.io/packages/source/a/amqp/amqp-2.4.1.tar.gz"
 
     version('5.0.1', sha256='9881f8e6fe23e3db9faa6cfd8c05390213e1d1b95c0162bc50552cad75bffa5f')
     version('2.6.1', sha256='70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21')

var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py

@@ -13,7 +13,7 @@ class PyAntlr4Python3Runtime(PythonPackage):
     """
 
     homepage = "https://www.antlr.org"
-    url      = "https://pypi.io/packages/source/a/antlr4-python3-runtime/antlr4-python3-runtime-4.7.2.tar.gz"
+    pypi = "antlr4-python3-runtime/antlr4-python3-runtime-4.7.2.tar.gz"
 
     version('4.7.2', sha256='168cdcec8fb9152e84a87ca6fd261b3d54c8f6358f42ab3b813b14a7193bb50b')
 

var/spack/repos/builtin/packages/py-apache-beam/package.py

@@ -10,7 +10,7 @@ class PyApacheBeam(PythonPackage):
     """Apache Beam is a unified programming model for Batch and Streaming."""
 
     homepage = "https://github.com/apache/beam"
-    url      = "https://pypi.io/packages/source/a/apache-beam/apache-beam-2.24.0.zip"
+    pypi = "apache-beam/apache-beam-2.24.0.zip"
 
     version('2.24.0', sha256='55c50b1a964bacc840a5e4cc3b4a42c4ef09d12192d215ba3cad65d4d22e09dd')
 

var/spack/repos/builtin/packages/py-apache-libcloud/package.py

@@ -10,7 +10,7 @@ class PyApacheLibcloud(PythonPackage):
     """Python library for multiple cloud provider APIs"""
 
     homepage = "http://libcloud.apache.org"
-    url      = "https://pypi.io/packages/source/a/apache-libcloud/apache-libcloud-1.2.1.tar.gz"
+    pypi = "apache-libcloud/apache-libcloud-1.2.1.tar.gz"
 
     version('1.2.1', sha256='b26b542c6c9785dd4e34892d87421ffa4c043335c1cba301a97a8d9748c423f2')
 

var/spack/repos/builtin/packages/py-apex/package.py

@@ -10,8 +10,7 @@ class PyApex(PythonPackage):
     """apex: Pyramid toolkit to add Velruse, Flash Messages,CSRF,
     ReCaptcha and Sessions."""
 
-    homepage = "https://pypi.org/project/apex/"
+    pypi = "apex/apex-0.9.10dev.tar.gz"
-    url      = "https://pypi.io/packages/source/a/apex/apex-0.9.10dev.tar.gz"
 
     version('0.9.10dev', sha256='48aa6d9e805e661e609161bd52e0d02d89a9a32f32dc29cde6c950df58129119')
 

var/spack/repos/builtin/packages/py-apipkg/package.py

@@ -9,8 +9,7 @@
 class PyApipkg(PythonPackage):
     """apipkg: namespace control and lazy-import mechanism"""
 
-    homepage = "https://pypi.python.org/pypi/apipkg"
+    pypi = "apipkg/apipkg-1.4.tar.gz"
-    url      = "https://pypi.io/packages/source/a/apipkg/apipkg-1.4.tar.gz"
 
     version('1.5', sha256='37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6')
     version('1.4', sha256='2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6')

var/spack/repos/builtin/packages/py-appdirs/package.py

@@ -11,7 +11,7 @@ class PyAppdirs(PythonPackage):
     dirs, e.g. a "user data dir"."""
 
     homepage = "https://github.com/ActiveState/appdirs"
-    url      = "https://pypi.io/packages/source/a/appdirs/appdirs-1.4.3.tar.gz"
+    pypi = "appdirs/appdirs-1.4.3.tar.gz"
 
     version('1.4.3', sha256='9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92')
     version('1.4.0', sha256='8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5')

var/spack/repos/builtin/packages/py-applicationinsights/package.py

@@ -9,7 +9,7 @@ class PyApplicationinsights(PythonPackage):
     Python."""
 
     homepage = "https://github.com/Microsoft/ApplicationInsights-Python"
-    url      = "https://pypi.io/packages/source/a/applicationinsights/applicationinsights-0.11.9.tar.gz"
+    pypi = "applicationinsights/applicationinsights-0.11.9.tar.gz"
 
     version('0.11.9', sha256='30a11aafacea34f8b160fbdc35254c9029c7e325267874e3c68f6bdbcd6ed2c3')
 

var/spack/repos/builtin/packages/py-appnope/package.py

@@ -10,6 +10,6 @@ class PyAppnope(PythonPackage):
     """Disable App Nap on OS X 10.9"""
 
     homepage = "https://github.com/minrk/appnope"
-    url      = "https://pypi.io/packages/source/a/appnope/appnope-0.1.0.tar.gz"
+    pypi = "appnope/appnope-0.1.0.tar.gz"
 
     version('0.1.0', sha256='8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71')

var/spack/repos/builtin/packages/py-apptools/package.py

@@ -10,7 +10,7 @@ class PyApptools(PythonPackage):
     that is commonly needed by many applications."""
 
     homepage = "https://docs.enthought.com/apptools"
-    url      = "https://pypi.io/packages/source/a/apptools/apptools-4.5.0.tar.gz"
+    pypi = "apptools/apptools-4.5.0.tar.gz"
 
     version('4.5.0', sha256='260ae0e2a86cb2df2fede631ab6ac8ece694a58a1def78cd015c890c57140582')
 

var/spack/repos/builtin/packages/py-apscheduler/package.py

@@ -10,7 +10,7 @@ class PyApscheduler(PythonPackage):
     """In-process task scheduler with Cron-like capabilities."""
 
     homepage = "https://github.com/agronholm/apscheduler"
-    url      = "https://pypi.io/packages/source/A/APScheduler/APScheduler-3.3.1.tar.gz"
+    pypi = "APScheduler/APScheduler-3.3.1.tar.gz"
 
     version('3.3.1', sha256='f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b')
     version('2.1.0', sha256='3b4b44387616902ad6d13122961013630eb25519937e5aa7c450de85656c9753')

var/spack/repos/builtin/packages/py-archspec/package.py

@@ -8,7 +8,7 @@ class PyArchspec(PythonPackage):
     """
 
     homepage = "https://archspec.readthedocs.io/en/latest/"
-    url = "https://pypi.io/packages/source/a/archspec/archspec-0.1.1.tar.gz"
+    pypi = "archspec/archspec-0.1.1.tar.gz"
 
     maintainers = ['alalazo']
 

var/spack/repos/builtin/packages/py-argcomplete/package.py

@@ -10,7 +10,7 @@ class PyArgcomplete(PythonPackage):
     """Bash tab completion for argparse."""
 
     homepage = "https://github.com/kislyuk/argcomplete"
-    url      = "https://pypi.io/packages/source/a/argcomplete/argcomplete-1.12.0.tar.gz"
+    pypi = "argcomplete/argcomplete-1.12.0.tar.gz"
 
     version('1.12.0', sha256='2fbe5ed09fd2c1d727d4199feca96569a5b50d44c71b16da9c742201f7cc295c')
     version('1.1.1',  sha256='cca45b5fe07000994f4f06a0b95bd71f7b51b04f81c3be0b4ea7b666e4f1f084')

var/spack/repos/builtin/packages/py-argon2-cffi/package.py

@@ -8,7 +8,7 @@ class PyArgon2Cffi(PythonPackage):
     """The secure Argon2 password hashing algorithm.."""
 
     homepage = "https://argon2-cffi.readthedocs.io/"
-    url      = "https://pypi.io/packages/source/a/argon2-cffi/argon2-cffi-20.1.0.tar.gz"
+    pypi = "argon2-cffi/argon2-cffi-20.1.0.tar.gz"
 
     version('20.1.0', sha256='d8029b2d3e4b4cea770e9e5a0104dd8fa185c1724a0f01528ae4826a6d25f97d')
 

var/spack/repos/builtin/packages/py-argparse/package.py

@@ -10,7 +10,7 @@ class PyArgparse(PythonPackage):
     """Python command-line parsing library."""
 
     homepage = "https://github.com/ThomasWaldmann/argparse/"
-    url      = "https://pypi.io/packages/source/a/argparse/argparse-1.4.0.tar.gz"
+    pypi = "argparse/argparse-1.4.0.tar.gz"
 
     version('1.4.0', sha256='62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4')
 

var/spack/repos/builtin/packages/py-args/package.py

@@ -10,7 +10,7 @@ class PyArgs(PythonPackage):
     """Command Arguments for Humans."""
 
     homepage = "https://github.com/kennethreitz/args"
-    url      = "https://pypi.io/packages/source/a/args/args-0.1.0.tar.gz"
+    pypi = "args/args-0.1.0.tar.gz"
 
     version('0.1.0', sha256='a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814')
 

var/spack/repos/builtin/packages/py-arrow/package.py

@@ -15,7 +15,7 @@ class PyArrow(PythonPackage):
     work with dates and times with fewer imports and a lot less code."""
 
     homepage = "https://arrow.readthedocs.io/en/latest/"
-    url      = "https://pypi.io/packages/source/a/arrow/arrow-0.16.0.tar.gz"
+    pypi = "arrow/arrow-0.16.0.tar.gz"
 
     version('0.16.0', sha256='92aac856ea5175c804f7ccb96aca4d714d936f1c867ba59d747a8096ec30e90a')
     version('0.14.7', sha256='67f8be7c0cf420424bc62d8d7dc40b44e4bb2f7b515f9cc2954fb36e35797656')

var/spack/repos/builtin/packages/py-arviz/package.py

@@ -12,7 +12,7 @@ class PyArviz(PythonPackage):
     model checking, comparison and diagnostics."""
 
     homepage = "http://github.com/arviz-devs/arviz"
-    url      = "https://pypi.io/packages/source/a/arviz/arviz-0.6.1.tar.gz"
+    pypi = "arviz/arviz-0.6.1.tar.gz"
 
     version('0.6.1', sha256='435edf8db49c41a8fa198f959e7581063006c49a4efdef4755bb778db6fd4f72')
 

var/spack/repos/builtin/packages/py-asciitree/package.py

@@ -10,7 +10,7 @@ class PyAsciitree(PythonPackage):
     """Draws ASCII trees."""
 
     homepage = "https://github.com/mbr/asciitree"
-    url      = "https://pypi.io/packages/source/a/asciitree/asciitree-0.3.3.tar.gz"
+    pypi = "asciitree/asciitree-0.3.3.tar.gz"
 
     version('0.3.3', sha256='4aa4b9b649f85e3fcb343363d97564aa1fb62e249677f2e18a96765145cc0f6e')
 

var/spack/repos/builtin/packages/py-asdf/package.py

@@ -12,7 +12,7 @@ class PyAsdf(PythonPackage):
     implementation of the ASDF Standard."""
 
     homepage = "https://github.com/spacetelescope/asdf"
-    url      = "https://pypi.io/packages/source/a/asdf/asdf-2.4.2.tar.gz"
+    pypi = "asdf/asdf-2.4.2.tar.gz"
 
     version('2.4.2', sha256='6ff3557190c6a33781dae3fd635a8edf0fa0c24c6aca27d8679af36408ea8ff2')
 

var/spack/repos/builtin/packages/py-ase/package.py

@@ -12,7 +12,7 @@ class PyAse(PythonPackage):
     visualizing and analyzing atomistic simulations."""
 
     homepage = "https://wiki.fysik.dtu.dk/ase/"
-    url      = "https://pypi.io/packages/source/a/ase/ase-3.13.0.tar.gz"
+    pypi = "ase/ase-3.13.0.tar.gz"
 
     version('3.18.0',
             sha256='39d45f12def2669605bffc82926acfb13a0d0610e6d82740fa316aafa70f97f9')

var/spack/repos/builtin/packages/py-asn1crypto/package.py

@@ -11,7 +11,7 @@ class PyAsn1crypto(PythonPackage):
     """Python ASN.1 library with a focus on performance and a pythonic API """
 
     homepage = "https://github.com/wbond/asn1crypto"
-    url      = "https://pypi.io/packages/source/a/asn1crypto/asn1crypto-0.22.0.tar.gz"
+    pypi = "asn1crypto/asn1crypto-0.22.0.tar.gz"
 
     version('0.24.0', sha256='9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49')
     version('0.22.0', sha256='cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a')

var/spack/repos/builtin/packages/py-aspy-yaml/package.py

@@ -10,7 +10,7 @@ class PyAspyYaml(PythonPackage):
     """Some extensions to pyyaml."""
 
     homepage = "https://github.com/asottile/aspy.yaml/"
-    url      = "https://pypi.io/packages/source/a/aspy.yaml/aspy.yaml-1.3.0.tar.gz"
+    pypi = "aspy.yaml/aspy.yaml-1.3.0.tar.gz"
 
     version('1.3.0', sha256='e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45')
 

var/spack/repos/builtin/packages/py-asteval/package.py

@@ -10,7 +10,7 @@ class PyAsteval(PythonPackage):
     """Safe, minimalistic evaluator of python expression using ast module"""
 
     homepage = "http://github.com/newville/asteval"
-    url      = "https://pypi.io/packages/source/a/asteval/asteval-0.9.18.tar.gz"
+    pypi = "asteval/asteval-0.9.18.tar.gz"
 
     version('0.9.18', sha256='5d64e18b8a72c2c7ae8f9b70d1f80b68bbcaa98c1c0d7047c35489d03209bc86')
 

var/spack/repos/builtin/packages/py-astor/package.py

@@ -10,8 +10,7 @@ class PyAstor(PythonPackage):
     astor is designed to allow easy manipulation of Python source via the AST.
     """
 
-    homepage = "https://pypi.python.org/pypi/astor"
+    pypi = "astor/astor-0.8.0.tar.gz"
-    url      = "https://pypi.io/packages/source/a/astor/astor-0.8.0.tar.gz"
 
     version('0.8.0', sha256='37a6eed8b371f1228db08234ed7f6cfdc7817a3ed3824797e20cbb11dc2a7862')
     version('0.6',   sha256='175ec395cde36aa0178c5a3120d03954c65d1ef4bb19ec4aa30e9d7a7cc426c4')

var/spack/repos/builtin/packages/py-astpretty/package.py

@@ -10,7 +10,7 @@ class PyAstpretty(PythonPackage):
     """Pretty print the output of python stdlib `ast.parse`."""
 
     homepage = "https://github.com/asottile/astpretty"
-    url      = "https://pypi.io/packages/source/a/astpretty/astpretty-2.0.0.tar.gz"
+    pypi = "astpretty/astpretty-2.0.0.tar.gz"
 
     version('2.0.0', sha256='e4724bfd753636ba4a84384702e9796e5356969f40af2596d846ce64addde086')
 

var/spack/repos/builtin/packages/py-astropy-healpix/package.py

@@ -12,7 +12,7 @@ class PyAstropyHealpix(PythonPackage):
     representing data on a sphere."""
 
     homepage = 'https://astropy-healpix.readthedocs.io/en/latest/'
-    url = 'https://pypi.io/packages/source/a/astropy-healpix/astropy-healpix-0.5.tar.gz'
+    pypi = 'astropy-healpix/astropy-healpix-0.5.tar.gz'
 
     version('0.5', sha256='5ae15da796a840f221fb83e25de791e827b6921bc21a365d99bc1a59c7c0cdad')
 

var/spack/repos/builtin/packages/py-astropy/package.py

@@ -13,7 +13,7 @@ class PyAstropy(PythonPackage):
     Python astronomy packages."""
 
     homepage = 'https://astropy.org/'
-    url = 'https://pypi.io/packages/source/a/astropy/astropy-4.0.1.post1.tar.gz'
+    pypi = 'astropy/astropy-4.0.1.post1.tar.gz'
 
     version('4.0.1.post1', sha256='5c304a6c1845ca426e7bc319412b0363fccb4928cb4ba59298acd1918eec44b5')
     version('3.2.1', sha256='706c0457789c78285e5464a5a336f5f0b058d646d60f4e5f5ba1f7d5bf424b28')

var/spack/repos/builtin/packages/py-astunparse/package.py

@@ -12,8 +12,7 @@ class PyAstunparse(PythonPackage):
     distribution; under Demo/parser in Python 2 and under Tools/parser in
     Python 3."""
 
-    homepage = "https://pypi.org/project/astunparse/"
+    pypi = "astunparse/astunparse-1.6.2.tar.gz"
-    url      = "https://pypi.io/packages/source/a/astunparse/astunparse-1.6.2.tar.gz"
 
     version('1.6.3', sha256='5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872')
     version('1.6.2', sha256='dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67')

var/spack/repos/builtin/packages/py-async-generator/package.py

@@ -9,8 +9,7 @@
 class PyAsyncGenerator(PythonPackage):
     """Provides async generator functionality to python 3.5."""
 
-    homepage = "https://pypi.org/project/async_generator/"
+    pypi = "async_generator/async_generator-1.10.tar.gz"
-    url      = "https://pypi.io/packages/source/a/async_generator/async_generator-1.10.tar.gz"
 
     version('1.10', sha256='6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144')
 

var/spack/repos/builtin/packages/py-atomicwrites/package.py

@@ -10,7 +10,7 @@ class PyAtomicwrites(PythonPackage):
     """Atomic file writes."""
 
     homepage = "https://github.com/untitaker/python-atomicwrites"
-    url      = "https://pypi.io/packages/source/a/atomicwrites/atomicwrites-1.3.0.tar.gz"
+    pypi = "atomicwrites/atomicwrites-1.3.0.tar.gz"
 
     version('1.3.0', sha256='75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6')
     version('1.1.5', sha256='240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585')

var/spack/repos/builtin/packages/py-atropos/package.py

@@ -11,7 +11,7 @@ class PyAtropos(PythonPackage):
     reads. It is a fork of the venerable Cutadapt read trimmer."""
 
     homepage = "https://atropos.readthedocs.io"
-    url      = "https://pypi.io/packages/source/a/atropos/atropos-1.1.22.tar.gz"
+    pypi = "atropos/atropos-1.1.22.tar.gz"
     git      = "https://github.com/jdidion/atropos.git"
 
     version('1.1.22', sha256='05e40cb9337421479c692e1154b962fbf811d7939b72c197a024929b7ae88b78')

var/spack/repos/builtin/packages/py-attrs/package.py

@@ -10,7 +10,7 @@ class PyAttrs(PythonPackage):
     """Classes Without Boilerplate"""
 
     homepage = "http://attrs.org/"
-    url      = "https://pypi.io/packages/source/a/attrs/attrs-20.3.0.tar.gz"
+    pypi = "attrs/attrs-20.3.0.tar.gz"
 
     version('20.3.0', sha256='832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700')
     version('20.2.0', sha256='26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594')

var/spack/repos/builtin/packages/py-audioread/package.py

@@ -11,7 +11,7 @@ class PyAudioread(PythonPackage):
     Python."""
 
     homepage = "https://github.com/beetbox/audioread"
-    url      = "https://pypi.io/packages/source/a/audioread/audioread-2.1.8.tar.gz"
+    pypi = "audioread/audioread-2.1.8.tar.gz"
 
     version('2.1.8', sha256='073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168')
 

var/spack/repos/builtin/packages/py-autograd-gamma/package.py

@@ -9,7 +9,7 @@ class PyAutogradGamma(PythonPackage):
     Gamma-family of functions."""
 
     homepage = "https://github.com/CamDavidsonPilon/autograd-gamma"
-    url      = "https://pypi.io/packages/source/a/autograd-gamma/autograd-gamma-0.4.3.tar.gz"
+    pypi = "autograd-gamma/autograd-gamma-0.4.3.tar.gz"
 
     version('0.4.3', sha256='2cb570cbb8da61ede937ccc004d87d3924108f754b351a86cdd2ad31ace6cdf6')
 

var/spack/repos/builtin/packages/py-autograd/package.py

@@ -18,7 +18,7 @@ class PyAutograd(PythonPackage):
     examples directory."""
 
     homepage = "https://github.com/HIPS/autograd"
-    url      = "https://pypi.io/packages/source/a/autograd/autograd-1.3.tar.gz"
+    pypi = "autograd/autograd-1.3.tar.gz"
 
     version('1.3', sha256='a15d147577e10de037de3740ca93bfa3b5a7cdfbc34cfb9105429c3580a33ec4')
 

var/spack/repos/builtin/packages/py-autopep8/package.py

@@ -11,7 +11,7 @@ class PyAutopep8(PythonPackage):
     PEP 8 style guide."""
 
     homepage = "https://github.com/hhatto/autopep8"
-    url      = "https://pypi.io/packages/source/a/autopep8/autopep8-1.2.4.tar.gz"
+    pypi = "autopep8/autopep8-1.2.4.tar.gz"
 
     version('1.4.4', sha256='4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee')
     version('1.3.3', sha256='ff787bffb812818c3071784b5ce9a35f8c481a0de7ea0ce4f8b68b8788a12f30')

var/spack/repos/builtin/packages/py-auxlib/package.py

@@ -10,7 +10,7 @@ class PyAuxlib(PythonPackage):
     """Auxlib is an auxiliary library to the python standard library."""
 
     homepage = "https://github.com/kalefranz/auxlib"
-    url      = "https://pypi.io/packages/source/a/auxlib/auxlib-0.0.43.tar.gz"
+    pypi = "auxlib/auxlib-0.0.43.tar.gz"
 
     version('0.0.43', sha256='0f175637e96a090a785767ce28483cf1aeec316a19afce9b2fbd113e1122786a')
 

var/spack/repos/builtin/packages/py-avro-json-serializer/package.py

@@ -10,7 +10,7 @@ class PyAvroJsonSerializer(PythonPackage):
     """Serializes data into a JSON format using AVRO schema."""
 
     homepage = "https://github.com/linkedin/python-avro-json-serializer"
-    url      = "https://pypi.io/packages/source/a/avro_json_serializer/avro_json_serializer-0.4.tar.gz"
+    pypi = "avro_json_serializer/avro_json_serializer-0.4.tar.gz"
 
     version('0.4',  sha256='f9dac2dac92036c5dd5aba8c716545fc0a0630cc365a51ab15bc2ac47eac28f1')
 

var/spack/repos/builtin/packages/py-avro-python3/package.py

@@ -12,7 +12,7 @@ class PyAvroPython3(PythonPackage):
     functions will be made available for both python2 and python3."""
 
     homepage = "https://github.com/apache/avro/tree/master/lang/py3"
-    url      = "https://pypi.io/packages/source/a/avro-python3/avro-python3-1.10.0.tar.gz"
+    pypi = "avro-python3/avro-python3-1.10.0.tar.gz"
 
     version('1.10.0', sha256='a455c215540b1fceb1823e2a918e94959b54cb363307c97869aa46b5b55bde05')
 

var/spack/repos/builtin/packages/py-avro/package.py

@@ -10,7 +10,7 @@ class PyAvro(PythonPackage):
     """Avro is a serialization and RPC framework."""
 
     homepage = "http://avro.apache.org/docs/current/"
-    url      = "https://pypi.io/packages/source/a/avro/avro-1.8.2.tar.gz"
+    pypi = "avro/avro-1.8.2.tar.gz"
 
     version('1.8.2', sha256='8f9ee40830b70b5fb52a419711c9c4ad0336443a6fba7335060805f961b04b59')
 

var/spack/repos/builtin/packages/py-awesome-slugify/package.py

@@ -10,7 +10,7 @@ class PyAwesomeSlugify(PythonPackage):
     """Python flexible slugify function"""
 
     homepage = "https://github.com/dimka665/awesome-slugify"
-    url      = "https://pypi.io/packages/source/a/awesome-slugify/awesome-slugify-1.6.5.tar.gz"
+    pypi = "awesome-slugify/awesome-slugify-1.6.5.tar.gz"
 
     version('1.6.5', sha256='bbdec3fa2187917473a2efad092b57f7125a55f841a7cf6a1773178d32ccfd71')
 

var/spack/repos/builtin/packages/py-azure-batch/package.py

@@ -8,7 +8,7 @@ class PyAzureBatch(PythonPackage):
     """Microsoft Azure Batch Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-batch/azure-batch-9.0.0.zip"
+    pypi = "azure-batch/azure-batch-9.0.0.zip"
 
     version('9.0.0', sha256='47ca6f50a640915e1cdc5ce3c1307abe5fa3a636236e561119cf62d9df384d84')
 

var/spack/repos/builtin/packages/py-azure-cli-command-modules-nspkg/package.py

@@ -8,7 +8,7 @@ class PyAzureCliCommandModulesNspkg(PythonPackage):
     """Microsoft Azure CLI Command Modules Namespace Package."""
 
     homepage = "https://github.com/Azure/azure-cli"
-    url      = "https://pypi.io/packages/source/a/azure-cli-command-modules-nspkg/azure-cli-command-modules-nspkg-2.0.3.tar.gz"
+    pypi = "azure-cli-command-modules-nspkg/azure-cli-command-modules-nspkg-2.0.3.tar.gz"
 
     version('2.0.3', sha256='4bd62bf5facb92dd4f89080e75eaee2ea1d3dd4e57a3d2a760ce501cf53f4e7d')
 

var/spack/repos/builtin/packages/py-azure-cli-core/package.py

@@ -8,7 +8,7 @@ class PyAzureCliCore(PythonPackage):
     """Microsoft Azure Command-Line Tools Core Module."""
 
     homepage = "https://github.com/Azure/azure-cli"
-    url      = "https://pypi.io/packages/source/a/azure-cli-core/azure-cli-core-2.9.1.tar.gz"
+    pypi = "azure-cli-core/azure-cli-core-2.9.1.tar.gz"
 
     version('2.9.1', sha256='8618a30f7ea2188506f29801220c06396d731c26e4de92c327e6b0e8cc790db5')
 

var/spack/repos/builtin/packages/py-azure-cli-nspkg/package.py

@@ -8,7 +8,7 @@ class PyAzureCliNspkg(PythonPackage):
     """Microsoft Azure CLI Namespace Package."""
 
     homepage = "https://github.com/Azure/azure-cli"
-    url      = "https://pypi.io/packages/source/a/azure-cli-nspkg/azure-cli-nspkg-3.0.4.tar.gz"
+    pypi = "azure-cli-nspkg/azure-cli-nspkg-3.0.4.tar.gz"
 
     version('3.0.4', sha256='1bde56090f548c6435bd3093995cf88e4c445fb040604df8b5b5f70780d79181')
 

var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py

@@ -8,7 +8,7 @@ class PyAzureCliTelemetry(PythonPackage):
     """Microsoft Azure CLI Telemetry Package."""
 
     homepage = "https://github.com/Azure/azure-cli"
-    url      = "https://pypi.io/packages/source/a/azure-cli-telemetry/azure-cli-telemetry-1.0.4.tar.gz"
+    pypi = "azure-cli-telemetry/azure-cli-telemetry-1.0.4.tar.gz"
 
     version('1.0.4', sha256='1f239d544d309c29e827982cc20113eb57037dba16db6cdd2e0283e437e0e577')
 

var/spack/repos/builtin/packages/py-azure-cli/package.py

@@ -8,7 +8,7 @@ class PyAzureCli(PythonPackage):
     """Microsoft Azure Command-Line Tools."""
 
     homepage = "https://github.com/Azure/azure-cli"
-    url      = "https://pypi.io/packages/source/a/azure-cli/azure-cli-2.9.1.tar.gz"
+    pypi = "azure-cli/azure-cli-2.9.1.tar.gz"
 
     version('2.9.1', sha256='749d850f73ea8956ab510288c1061dd7066180a8583081a6d560fdc7ac8314d6')
 

var/spack/repos/builtin/packages/py-azure-common/package.py

@@ -8,7 +8,7 @@ class PyAzureCommon(PythonPackage):
     """Microsoft Azure Client Library for Python (Common)."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-common/azure-common-1.1.25.zip"
+    pypi = "azure-common/azure-common-1.1.25.zip"
 
     version('1.1.25', sha256='ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054')
 

var/spack/repos/builtin/packages/py-azure-core/package.py

@@ -8,7 +8,7 @@ class PyAzureCore(PythonPackage):
     """Microsoft Azure Core Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/core/azure-core"
-    url      = "https://pypi.io/packages/source/a/azure-core/azure-core-1.7.0.zip"
+    pypi = "azure-core/azure-core-1.7.0.zip"
 
     version('1.7.0', sha256='a66da240a287f447f9867f54ba09ea235895cec13ea38c5f490ce4eedefdd75c')
     version('1.6.0', sha256='d10b74e783cff90d56360e61162afdd22276d62dc9467e657ae866449eae7648')

var/spack/repos/builtin/packages/py-azure-cosmos/package.py

@@ -8,7 +8,7 @@ class PyAzureCosmos(PythonPackage):
     """Microsoft Azure Cosmos Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-cosmos/azure-cosmos-4.0.0.zip"
+    pypi = "azure-cosmos/azure-cosmos-4.0.0.zip"
 
     version('4.0.0', sha256='c4e40e0d378fd0c96664f46f1ad08e6c8aaaac31c463726a74aae9eae724442d')
     version('3.2.0', sha256='4f77cc558fecffac04377ba758ac4e23f076dc1c54e2cf2515f85bc15cbde5c6',

var/spack/repos/builtin/packages/py-azure-datalake-store/package.py

@@ -8,7 +8,7 @@ class PyAzureDatalakeStore(PythonPackage):
     """Azure Data Lake Store Filesystem Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-data-lake-store-python"
-    url      = "https://pypi.io/packages/source/a/azure-datalake-store/azure-datalake-store-0.0.48.tar.gz"
+    pypi = "azure-datalake-store/azure-datalake-store-0.0.48.tar.gz"
 
     version('0.0.48', sha256='d27c335783d4add00b3a5f709341e4a8009857440209e15a739a9a96b52386f7')
 

var/spack/repos/builtin/packages/py-azure-functions-devops-build/package.py

@@ -9,7 +9,7 @@ class PyAzureFunctionsDevopsBuild(PythonPackage):
     Specifically made for the Azure CLI."""
 
     homepage = "https://github.com/Azure/azure-functions-devops-build"
-    url      = "https://pypi.io/packages/source/a/azure-functions-devops-build/azure-functions-devops-build-0.0.22.tar.gz"
+    pypi = "azure-functions-devops-build/azure-functions-devops-build-0.0.22.tar.gz"
 
     version('0.0.22', sha256='c6341abda6098813f8fa625acd1e925410a17a8a1c7aaabdf975bb7cecb14edf')
 

var/spack/repos/builtin/packages/py-azure-graphrbac/package.py

@@ -8,7 +8,7 @@ class PyAzureGraphrbac(PythonPackage):
     """Microsoft Azure Graph RBAC Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-graphrbac/azure-graphrbac-0.61.1.zip"
+    pypi = "azure-graphrbac/azure-graphrbac-0.61.1.zip"
 
     version('0.61.1', sha256='53e98ae2ca7c19b349e9e9bb1b6a824aeae8dcfcbe17190d20fe69c0f185b2e2')
     version('0.60.0', sha256='d0bb62d8bf8e196b903f3971ba4afa448e4fe14e8394ebfcdd941d84d62ecafe')

var/spack/repos/builtin/packages/py-azure-identity/package.py

@@ -8,7 +8,7 @@ class PyAzureIdentity(PythonPackage):
     """Microsoft Azure Identity Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/identity/azure-identity"
-    url      = "https://pypi.io/packages/source/a/azure-identity/azure-identity-1.3.1.zip"
+    pypi = "azure-identity/azure-identity-1.3.1.zip"
 
     version('1.3.1', sha256='5a59c36b4b05bdaec455c390feda71b6495fc828246593404351b9a41c2e877a')
     version('1.2.0', sha256='b32acd1cdb6202bfe10d9a0858dc463d8960295da70ae18097eb3b85ab12cb91')

var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py

@@ -8,7 +8,7 @@ class PyAzureKeyvaultCertificates(PythonPackage):
     """Microsoft Azure Key Vault Certificates Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-certificates"
-    url      = "https://pypi.io/packages/source/a/azure-keyvault-certificates/azure-keyvault-certificates-4.1.0.zip"
+    pypi = "azure-keyvault-certificates/azure-keyvault-certificates-4.1.0.zip"
 
     version('4.1.0', sha256='544f56480619e1db350f2e7b117b22af778e02174bd6bcb0af9ae00c50353419')
 

var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py

@@ -8,7 +8,7 @@ class PyAzureKeyvaultKeys(PythonPackage):
     """Microsoft Azure Key Vault Keys Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-keys"
-    url      = "https://pypi.io/packages/source/a/azure-keyvault-keys/azure-keyvault-keys-4.1.0.zip"
+    pypi = "azure-keyvault-keys/azure-keyvault-keys-4.1.0.zip"
 
     version('4.1.0', sha256='f9967b4deb48e619f6c40558f69e48978779cc09c8a7fad33d536cfc41cd68f9')
 

var/spack/repos/builtin/packages/py-azure-keyvault-nspkg/package.py

@@ -8,7 +8,7 @@ class PyAzureKeyvaultNspkg(PythonPackage):
     """Microsoft Azure Key Vault Namespace Package."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault"
-    url      = "https://pypi.io/packages/source/a/azure-keyvault-nspkg/azure-keyvault-nspkg-1.0.0.zip"
+    pypi = "azure-keyvault-nspkg/azure-keyvault-nspkg-1.0.0.zip"
 
     version('1.0.0', sha256='ac68b88aab9c6caf54a23da2a1d1c718d7520bae5adff04dd0a743228269b641')
 

var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py

@@ -8,7 +8,7 @@ class PyAzureKeyvaultSecrets(PythonPackage):
     """Microsoft Azure Key Vault Secrets Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-secrets"
-    url      = "https://pypi.io/packages/source/a/azure-keyvault-secrets/azure-keyvault-secrets-4.1.0.zip"
+    pypi = "azure-keyvault-secrets/azure-keyvault-secrets-4.1.0.zip"
 
     version('4.1.0', sha256='4f3bfac60e025e01dd1c1998b73649d45d706975356c0cf147174cf5a6ddf8be')
 

var/spack/repos/builtin/packages/py-azure-keyvault/package.py

@@ -8,7 +8,7 @@ class PyAzureKeyvault(PythonPackage):
     """Microsoft Azure Key Vault Client Libraries for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault"
-    url      = "https://pypi.io/packages/source/a/azure-keyvault/azure-keyvault-4.1.0.zip"
+    pypi = "azure-keyvault/azure-keyvault-4.1.0.zip"
 
     version('4.1.0', sha256='69002a546921a8290eb54d9a3805cfc515c321bc1d4c0bfcfb463620245eca40')
     version('1.1.0', sha256='37a8e5f376eb5a304fcd066d414b5d93b987e68f9212b0c41efa37d429aadd49')

var/spack/repos/builtin/packages/py-azure-loganalytics/package.py

@@ -8,7 +8,7 @@ class PyAzureLoganalytics(PythonPackage):
     """Microsoft Azure Log Analytics Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-loganalytics/azure-loganalytics-0.1.0.zip"
+    pypi = "azure-loganalytics/azure-loganalytics-0.1.0.zip"
 
     version('0.1.0', sha256='3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e')
 

var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtAdvisor(PythonPackage):
     """Microsoft Azure Advisor Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-advisor/azure-mgmt-advisor-4.0.0.zip"
+    pypi = "azure-mgmt-advisor/azure-mgmt-advisor-4.0.0.zip"
 
     version('4.0.0', sha256='1ecea7a9dc48c099c06aab68aace7fdbded91a5522932882b1707c29fa055054')
     version('2.0.1', sha256='1929d6d5ba49d055fdc806e981b93cf75ea42ba35f78222aaf42d8dcf29d4ef3')

var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtApimanagement(PythonPackage):
     """Microsoft Azure API Management Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-apimanagement/azure-mgmt-apimanagement-0.2.0.zip"
+    pypi = "azure-mgmt-apimanagement/azure-mgmt-apimanagement-0.2.0.zip"
 
     version('0.2.0', sha256='790f01c0b32583706b8b8c59667c0f5a51cd70444eee76474e23a598911e1d72')
     version('0.1.0', sha256='5d45d3438c6a11bae6bb8d4d5173cdb44b85683695f9f3433f22f45aecc47819')

var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py

@@ -9,7 +9,7 @@ class PyAzureMgmtAppconfiguration(PythonPackage):
     """
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-appconfiguration/azure-mgmt-appconfiguration-0.5.0.zip"
+    pypi = "azure-mgmt-appconfiguration/azure-mgmt-appconfiguration-0.5.0.zip"
 
     version('0.5.0', sha256='211527511d7616a383cc196956eaf2b7ee016f2367d367924b3715f2a41106da')
     version('0.4.0', sha256='85f6202ba235fde6be274f3dec1578b90235cf31979abea3fcfa476d0b2ac5b6')

var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py

@@ -9,7 +9,7 @@ class PyAzureMgmtApplicationinsights(PythonPackage):
     Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-applicationinsights/azure-mgmt-applicationinsights-0.3.0.zip"
+    pypi = "azure-mgmt-applicationinsights/azure-mgmt-applicationinsights-0.3.0.zip"
 
     version('0.3.0', sha256='3c788a54db4fbca1a8850151462ec1471ff59c86b3a10d6082952bbdaa7e6651')
     version('0.1.1', sha256='f10229eb9e3e9d0ad20188b8d14d67055e86f3815b43b75eedf96b654bee2a9b')

var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtAuthorization(PythonPackage):
     """Microsoft Azure Authorization Management Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-authorization/azure-mgmt-authorization-0.60.0.zip"
+    pypi = "azure-mgmt-authorization/azure-mgmt-authorization-0.60.0.zip"
 
     version('0.60.0', sha256='31e875a34ac2c5d6fefe77b4a8079a8b2bdbe9edb957e47e8b44222fb212d6a7')
     version('0.52.0', sha256='16a618c4357c11e96de376856c396f09e76a56473920cdf7a66735fabaa2a70c')

var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtBatch(PythonPackage):
     """Microsoft Azure Batch Management Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-batch/azure-mgmt-batch-9.0.0.zip"
+    pypi = "azure-mgmt-batch/azure-mgmt-batch-9.0.0.zip"
 
     version('9.0.0', sha256='03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe')
 

var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtBatchai(PythonPackage):
     """Microsoft Azure Batch AI Management Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-batchai/azure-mgmt-batchai-2.0.0.zip"
+    pypi = "azure-mgmt-batchai/azure-mgmt-batchai-2.0.0.zip"
 
     version('2.0.0', sha256='f1870b0f97d5001cdb66208e5a236c9717a0ed18b34dbfdb238a828f3ca2a683')
 

var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtBilling(PythonPackage):
     """Microsoft Azure Billing Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-billing/azure-mgmt-billing-0.2.0.zip"
+    pypi = "azure-mgmt-billing/azure-mgmt-billing-0.2.0.zip"
 
     version('0.2.0', sha256='85f73bb3808a7d0d2543307e8f41e5b90a170ad6eeedd54fe7fcaac61b5b22d2')
 

var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtBotservice(PythonPackage):
     """Microsoft Azure Bot Service Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-botservice/azure-mgmt-botservice-0.2.0.zip"
+    pypi = "azure-mgmt-botservice/azure-mgmt-botservice-0.2.0.zip"
 
     version('0.2.0', sha256='b21d8858e69aa16d25b908c40116a1f773c127ec4dd602cbb8542ebf39a55d83')
 

var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtCdn(PythonPackage):
     """Microsoft Azure CDN Management Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-cdn/azure-mgmt-cdn-4.0.0.zip"
+    pypi = "azure-mgmt-cdn/azure-mgmt-cdn-4.0.0.zip"
 
     # Release candidate needed for py-azure-cli
     version('4.1.0rc1', sha256='853c73d612f5d97387e079c5841a9f1a05702173d0c7c0c59ba7b0fd86380503')

var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py

@@ -9,7 +9,7 @@ class PyAzureMgmtCognitiveservices(PythonPackage):
     Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-cognitiveservices/azure-mgmt-cognitiveservices-6.2.0.zip"
+    pypi = "azure-mgmt-cognitiveservices/azure-mgmt-cognitiveservices-6.2.0.zip"
 
     version('6.2.0', sha256='93503507ba87c18fe24cd3dfcd54e6e69a4daf7636f38b7537e09cee9a4c13ce')
 

var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtCompute(PythonPackage):
     """Microsoft Azure Compute Management Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-compute/azure-mgmt-compute-13.0.0.zip"
+    pypi = "azure-mgmt-compute/azure-mgmt-compute-13.0.0.zip"
 
     version('13.0.0', sha256='7f331bafcbedf25d65aa42038f7553747dab18d7f10a5af3297192d31c45339e')
 

var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtConsumption(PythonPackage):
     """Microsoft Azure Consumption Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-consumption/azure-mgmt-consumption-3.0.0.zip"
+    pypi = "azure-mgmt-consumption/azure-mgmt-consumption-3.0.0.zip"
 
     version('3.0.0', sha256='035d4b74ca7c47e2683bea17105fd9014c27060336fb6255324ac86b27f70f5b')
     version('2.0.0', sha256='9a85a89f30f224d261749be20b4616a0eb8948586f7f0f20573b8ea32f265189')

var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtContainerinstance(PythonPackage):
     """Microsoft Azure Container Instance Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-containerinstance/azure-mgmt-containerinstance-2.0.0.zip"
+    pypi = "azure-mgmt-containerinstance/azure-mgmt-containerinstance-2.0.0.zip"
 
     version('2.0.0', sha256='5ad247d186c3c040da7a1d40ad39c9881e99afc58271f673abb602abb0b6b85b')
     version('1.5.0', sha256='b055386f04ba8433112b0df7fcbc260b5208828d7bb8c057e760fe596aa7a8cd')

var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py

@@ -8,7 +8,7 @@ class PyAzureMgmtContainerregistry(PythonPackage):
     """Microsoft Azure Container Registry Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    url      = "https://pypi.io/packages/source/a/azure-mgmt-containerregistry/azure-mgmt-containerregistry-2.8.0.zip"
+    pypi = "azure-mgmt-containerregistry/azure-mgmt-containerregistry-2.8.0.zip"
 
     # Release candidate needed for py-azure-cli
     version('3.0.0rc14', sha256='d23ce93ec5903d00f79f0ac995e16bf47197130239f7f182509add3277b73071')