manual changes

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

@@ -15,9 +15,16 @@ class PyA2wsgi(PythonPackage):
 
     license("Apache-2.0")
 
-    version("1.7.0", sha256="a906f62c0250eb0201120b93417dd0b12b105b5db35af431bfe86ef0dc5bbab2")
-    version("1.6.0", sha256="67a9902db6da72c268a24d4e5d01348f736980a577279b7df801c8902aba8554")
+    version(
+        "1.7.0",
+        sha256="d26be288b2a5f368181b6e0d1cfc3c2a4180732cca10e9cc4b9bc333235b8d80",
+        url="https://pypi.org/packages/c5/b8/ccf880c8a3e564283f0ed1b4268e13e4cb9075491b0863f9a2bf83d5e58a/a2wsgi-1.7.0-py3-none-any.whl",
+    )
+    version(
+        "1.6.0",
+        sha256="ee8507d07fd86b781d3e039fe458366e2127bd2251b47fcbedadbf013095a21e",
+        url="https://pypi.org/packages/b2/fb/4bb5451ee0a98194267a99acb060f9113c9b13796020c1a63eadd637acdb/a2wsgi-1.6.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6.2:", type=("build", "run"))
-
-    depends_on("py-pdm-pep517@1.0.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@1.7")

var/spack/repos/builtin/packages/py-about-time/package.py

@@ -16,9 +16,21 @@ class PyAboutTime(PythonPackage):
 
     license("MIT")
 
-    version("4.2.1", sha256="6a538862d33ce67d997429d14998310e1dbfda6cb7d9bbfbf799c4709847fece")
-    version("4.1.0", sha256="963b1f3739b0c9732eb205031762b76f1291d89b5d0c8220a8d5b154e32ce650")
-    version("3.1.1", sha256="586b329450c9387d1ae8c42d2db4f5b4c57a54508d0f1b7bb00322ffd5ce9f9b")
+    version(
+        "4.2.1",
+        sha256="8bbf4c75fe13cbd3d72f49a03b02c5c7dca32169b6d49117c257e7eb3eaee341",
+        url="https://pypi.org/packages/fb/cd/7ee00d6aa023b1d0551da0da5fee3bc23c3eeea632fbfc5126d1fec52b7e/about_time-4.2.1-py3-none-any.whl",
+    )
+    version(
+        "4.1.0",
+        sha256="fdf24423c4322ee32fa1338ff4b11f704b649427110290f94bfe4e16ad246f18",
+        url="https://pypi.org/packages/fa/fe/d680887c70b9330741fb599bd0106500f9bc438c5995b516cac0d7ebfe50/about_time-4.1.0-py3-none-any.whl",
+    )
+    version(
+        "3.1.1",
+        sha256="96841beb3f9b5de1cbb323d2bdb0fa9abdecbc46f2d546b9b3c2483d23daa17a",
+        url="https://pypi.org/packages/bc/3e/97d324a2161da150d5d8f979ffce526ebbb938dbaf9536caaf0c4efe3680/about_time-3.1.1-py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:3", type=("build", "run"), when="@4:")
-    depends_on("py-setuptools", type="build")
+    with default_args(type="run"):
+        depends_on("python@3.7:3", when="@4:")

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

@@ -16,14 +16,23 @@ class PyAccelerate(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.21.0", sha256="e2959a0bf74d97c0b3c0e036ed96065142a060242281d27970d4c4e34f11ca59")
-    version("0.16.0", sha256="d13e30f3e6debfb46cada7b931af85560619b6a6a839d0cafeeab6ed7c6a498d")
+    version(
+        "0.21.0",
+        sha256="e2609d37f2c6a56e36a0612feae6ff6d9daac9759f4899432b86b1dc97024ebb",
+        url="https://pypi.org/packages/70/f9/c381bcdd0c3829d723aa14eec8e75c6c377b4ca61ec68b8093d9f35fc7a7/accelerate-0.21.0-py3-none-any.whl",
+    )
+    version(
+        "0.16.0",
+        sha256="27aa39b2076560b3ee674b9650c237c58520b3fd7907e5da1f922cf6868c1576",
+        url="https://pypi.org/packages/dc/0c/f95215bc5f65e0a5fb97d4febce7c18420002a4c3ea5182294dc576f17fb/accelerate-0.16.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.8.0:", when="@0.21.0:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-numpy@1.17:", type=("build", "run"))
-    depends_on("py-packaging@20:", type=("build", "run"))
-    depends_on("py-psutil", type=("build", "run"))
-    depends_on("py-pyyaml", type=("build", "run"))
-    depends_on("py-torch@1.10.0:", when="@0.21.0:", type=("build", "run"))
-    depends_on("py-torch@1.4:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@0.21:")
+        depends_on("python@3.7:", when="@0.10:0.20")
+        depends_on("py-numpy@1.17.0:")
+        depends_on("py-packaging@20:", when="@0.10:")
+        depends_on("py-psutil", when="@0.10:")
+        depends_on("py-pyyaml")
+        depends_on("py-torch@1.10:", when="@0.21:")
+        depends_on("py-torch@1.4:", when="@:0.18")

var/spack/repos/builtin/packages/py-accessible-pygments/package.py

@@ -15,7 +15,11 @@ class PyAccessiblePygments(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.0.4", sha256="e7b57a9b15958e9601c7e9eb07a440c813283545a20973f2574a5f453d0e953e")
+    version(
+        "0.0.4",
+        sha256="416c6d8c1ea1c5ad8701903a20fcedf953c6e720d64f33dc47bfb2d3f2fa4e8d",
+        url="https://pypi.org/packages/20/d7/45cfa326d945e411c7e02764206845b05f8f5766aa7ebc812ef3bc4138cd/accessible_pygments-0.0.4-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-pygments@1.5:", type=("build", "run"))
-    depends_on("py-setuptools", type=("build"))
+    with default_args(type="run"):
+        depends_on("py-pygments@1.5:")

var/spack/repos/builtin/packages/py-acme-tiny/package.py

@@ -14,8 +14,8 @@ class PyAcmeTiny(PythonPackage):
 
     license("MIT")
 
-    version("master", branch="master")
-    version("4.0.4", commit="5350420d35177eda733d85096433a24e55f8d00e")
-
-    depends_on("py-setuptools", type=("build", "run"))
-    depends_on("py-setuptools-scm", type="build")
+    version(
+        "4.0.4",
+        sha256="70ab30bbbbcfadbf68ca47b4d991fe12cd5126574a6fb0ead7985f8885ee30b0",
+        url="https://pypi.org/packages/96/4f/19c6a31d6f520fdca0e2e03003c94d34b21a131ebe3b82da1953075e7bea/acme_tiny-4.0.4-py2.py3-none-any.whl",
+    )

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

@@ -19,10 +19,14 @@ class PyAdal(PythonPackage):
 
     license("MIT")
 
-    version("1.2.4", sha256="7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0")
+    version(
+        "1.2.4",
+        sha256="b332316f54d947f39acd9628e7d61d90f6e54d413d6f97025a51482c96bac6bc",
+        url="https://pypi.org/packages/46/58/a19e0eb0c388fb7aced40f940c09069343862613d83095b592a8d3961ba1/adal-1.2.4-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-pyjwt@1.0.0:", type=("build", "run"))
-    depends_on("py-requests@2.0.0:", type=("build", "run"))
-    depends_on("py-python-dateutil@2.1.0:", type=("build", "run"))
-    depends_on("py-cryptography@1.1.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-cryptography@1.1:")
+        depends_on("py-pyjwt@1:", when="@:1.2.5")
+        depends_on("py-python-dateutil@2:", when="@:1.2.5")
+        depends_on("py-requests@2:", when="@:1.2.5")

var/spack/repos/builtin/packages/py-adb-enhanced/package.py

@@ -17,15 +17,19 @@ class PyAdbEnhanced(PythonPackage):
 
     license("Apache-2.0")
 
-    version("2.5.10", sha256="9e913d09814ce99974c455a766c5b616a92bca551e657517d6e079882eb19bdb")
-    version("2.5.4", sha256="329ee2e0cfceaa41c591398b365d9acdfd45ffe913c64ac06e1538041986fffb")
-    version("2.5.3", sha256="5a1d5182d1a073b440e862e5481c7a21073eccc3cda7a4774a2aa311fee9bbdc")
-    version("2.5.2", sha256="055676156c1566b8d952b9fdfdd89fc09f2d5d1e3b90b4cdf40858ce9947e2ca")
+    version(
+        "2.5.10",
+        sha256="19e9462702d1d20ee023686e128a43d15149411c7cd2838639df7d6df6d282ee",
+        url="https://pypi.org/packages/2b/ae/0515f15799a811d7e06c60ae4bcc7ac3df8f6c5024a8fb6093e0a0cc6d77/adb_enhanced-2.5.10-py3-none-any.whl",
+    )
+    version(
+        "2.5.4",
+        sha256="f8c4a1c4ee7ca82210b6f2472763c0239cd63c9c58c5b4b2b7d0edf3c7c5180e",
+        url="https://pypi.org/packages/fb/48/c9325bd726bebddf68f77da0d1ac90b6542c97121d008423f5d68f77e1ac/adb_enhanced-2.5.4-py3-none-any.whl",
+    )
 
-    depends_on("python@3:", type=("build", "run"))
-    depends_on("python@3.4:", when="@2.5.10:", type=("build", "run"))
-    depends_on("py-setuptools", type=("build", "run"))
-    depends_on("py-docopt", type=("build", "run"))
-    depends_on("py-future", when="@:2.5.4", type=("build", "run"))
-    depends_on("py-psutil", type=("build", "run"))
-    depends_on("py-asyncio", when="@:2.5.4", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-asyncio", when="@2.2:2.5.4")
+        depends_on("py-docopt")
+        depends_on("py-future", when="@:2.5.4")
+        depends_on("py-psutil")

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

@@ -16,6 +16,8 @@ class PyAddict(PythonPackage):
 
     license("MIT")
 
-    version("2.2.1", sha256="398bba9e7fa25e2ce144c5c4b8ec6208e89b9445869403dfa88ab66ec110fa12")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "2.2.1",
+        sha256="1948c2a5d93ba6026eb91aef2c971234aaf72488a9c07ab8a7950f82ae30eea7",
+        url="https://pypi.org/packages/14/6f/beb258220417c1a0fe11e842f2e012a1be7eeeaa72a1d10ba17a804da367/addict-2.2.1-py3-none-any.whl",
+    )

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

@@ -13,7 +13,13 @@ class PyAenum(PythonPackage):
     homepage = "https://github.com/ethanfurman/aenum"
     pypi = "aenum/aenum-2.1.2.tar.gz"
 
-    version("3.1.12", sha256="3e531c91860a81f885f7e6e97d219ae9772cb899580084788935dad7d9742ef0")
-    version("2.1.2", sha256="a3208e4b28db3a7b232ff69b934aef2ea1bf27286d9978e1e597d46f490e4687")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "3.1.12",
+        sha256="2d544ef7323c088d68abf9a84b9f3f6db0d516fec685e15678b5f84fdb7b8ba0",
+        url="https://pypi.org/packages/57/32/18862210ce170908bc19de5cbb3844b165679123b32fe119d4116e46c2c8/aenum-3.1.12-py3-none-any.whl",
+    )
+    version(
+        "2.1.2",
+        sha256="3df9b84cce5dc9ed77c337079f97b66c44c0053eb87d6f4d46b888dc45801e38",
+        url="https://pypi.org/packages/0d/46/5b6a6c13fee40f9dfaba84de1394bfe082c0c7d95952ba0ffbd56ce3a3f7/aenum-2.1.2-py3-none-any.whl",
+    )

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

@@ -12,8 +12,10 @@ class PyAffine(PythonPackage):
     homepage = "https://github.com/sgillies/affine"
     url = "https://github.com/sgillies/affine/archive/2.1.0.zip"
 
-    depends_on("py-setuptools", type="build")
+    version(
+        "2.1.0",
+        sha256="ed8bc4b217ec051c07c2733bc60229a0dfd00d88bbe0b94db992e65a0d876bc4",
+        url="https://pypi.org/packages/c9/24/71214ac2b93db5b64775821ed32dd6f9da451d51dbb83cb0b66fa38acac7/affine-2.1.0-py3-none-any.whl",
+    )
 
     license("BSD-3-Clause")
-
-    version("2.1.0", sha256="b67b7dee9a9865185a931758a3e347ad8583d0ac985895b90985a477ccfa4745")

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

@@ -14,9 +14,17 @@ class PyAgateDbf(PythonPackage):
 
     license("MIT")
 
-    version("0.2.2", sha256="589682b78c5c03f2dc8511e6e3edb659fb7336cd118e248896bb0b44c2f1917b")
-    version("0.2.1", sha256="00c93c498ec9a04cc587bf63dd7340e67e2541f0df4c9a7259d7cb3dd4ce372f")
+    version(
+        "0.2.2",
+        sha256="632a8826ecde3dffb28f15e3ccb9d523bc15b79eb157f063f2febc2c4078957a",
+        url="https://pypi.org/packages/fc/75/32847937627c8fe2271606d71de85486ffaf01b28a091ecdc43e58876b1b/agate_dbf-0.2.2-py2.py3-none-any.whl",
+    )
+    version(
+        "0.2.1",
+        sha256="f618fadb413d41468c90d72fca945681d82d9e4d1b3d89f9bda52e607b828c0b",
+        url="https://pypi.org/packages/3d/d0/5a161b906a7eaa2b3d5690bbf0de5ceb4398e21d3e915f69869cfeef906f/agate_dbf-0.2.1-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-agate@1.5.0:", type=("build", "run"))
-    depends_on("py-dbfread@2.0.5:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-agate@1.5:", when="@0.2.2:")
+        depends_on("py-dbfread@2.0.5:", when="@0.2.2:")

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

@@ -16,13 +16,8 @@ class PyAgate(PythonPackage):
 
     license("MIT")
 
-    version("1.6.1", sha256="c93aaa500b439d71e4a5cf088d0006d2ce2c76f1950960c8843114e5f361dfd3")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-six@1.9.0:", type=("build", "run"))
-    depends_on("py-pytimeparse@1.1.5:", type=("build", "run"))
-    depends_on("py-parsedatetime@2.1:", type=("build", "run"))
-    depends_on("py-babel@2.0:", type=("build", "run"))
-    depends_on("py-isodate@0.5.4:", type=("build", "run"))
-    depends_on("py-python-slugify@1.2.1:", type=("build", "run"))
-    depends_on("py-leather@0.3.2:", type=("build", "run"))
+    version(
+        "1.6.1",
+        sha256="48d6f80b35611c1ba25a642cbc5b90fcbdeeb2a54711c4a8d062ee2809334d1c",
+        url="https://pypi.org/packages/92/77/ef675f16486884ff7f77f3cb87aafa3429c6bb869d4d73ee23bf4675e384/agate-1.6.1-py2.py3-none-any.whl",
+    )

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

@@ -16,9 +16,13 @@ class PyAhpy(PythonPackage):
 
     license("MIT")
 
-    version("2.0", sha256="f0af7b81b51466a055778d84f64c98f5cc3e1ba34aaeaedc48ba0b91008e40e3")
+    version(
+        "2.0",
+        sha256="266d6a9c8669f9950188e83620bae47dc9083e41592a91d6890c4e497f13cc44",
+        url="https://pypi.org/packages/ab/50/c0af318811c4dee0e72c04110f0d5d6a97df7a5cbd8dcec727d22d3456e4/ahpy-2.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:3", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-numpy", type=("build", "run"))
-    depends_on("py-scipy", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:3")
+        depends_on("py-numpy")
+        depends_on("py-scipy")

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

@@ -15,11 +15,18 @@ class PyAiofiles(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.7.0", sha256="a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4")
-    version("0.5.0", sha256="98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af")
+    version(
+        "0.7.0",
+        sha256="c67a6823b5f23fcab0a2595a289cec7d8c863ffcb4322fb8cd6b90400aedfdbc",
+        url="https://pypi.org/packages/e7/61/007ac6f27fe1c2dc44d3a62f429a8440de1601428b4d0291eae1a3494d1f/aiofiles-0.7.0-py3-none-any.whl",
+    )
+    version(
+        "0.5.0",
+        sha256="377fdf7815cc611870c59cbd07b68b180841d2a2b79812d8c218be02448c2acb",
+        url="https://pypi.org/packages/f4/2b/078a9771ae4b67e36b0c2a973df845260833a4eb088b81c84b738509b4c4/aiofiles-0.5.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:3", when="@0.7:", type=("build", "run"))
-    depends_on("py-poetry-core@1:", when="@0.7:", type="build")
+    with default_args(type="run"):
+        depends_on("python@:3", when="@0.7:0")
 
     # Historical dependencies
-    depends_on("py-setuptools", when="@:0.6", type="build")

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

@@ -16,8 +16,11 @@ class PyAiohttpCors(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.7.0", sha256="4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d")
+    version(
+        "0.7.0",
+        sha256="0451ba59fdf6909d0e2cd21e4c0a43752bc0703d33fc78ae94d9d9321710193e",
+        url="https://pypi.org/packages/13/e7/e436a0c0eb5127d8b491a9b83ecd2391c6ff7dcd5548dfaec2080a2340fd/aiohttp_cors-0.7.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.4.1:", type=("build", "run"))
-    depends_on("py-setuptools@20.8.1:", type="build")
-    depends_on("py-aiohttp@1.1:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-aiohttp@1.1:", when="@0.5:0.5.0,0.5.2:")

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

@@ -16,10 +16,17 @@ class PyAioitertools(PythonPackage):
 
     license("MIT")
 
-    version("0.11.0", sha256="42c68b8dd3a69c2bf7f2233bf7df4bb58b557bca5252ac02ed5187bbc67d6831")
-    version("0.7.1", sha256="54a56c7cf3b5290d1cb5e8974353c9f52c677612b5d69a859369a020c53414a3")
+    version(
+        "0.11.0",
+        sha256="04b95e3dab25b449def24d7df809411c10e62aab0cbe31a50ca4e68748c43394",
+        url="https://pypi.org/packages/45/66/d1a9fd8e6ff88f2157cb145dd054defb0fd7fe2507fe5a01347e7c690eab/aioitertools-0.11.0-py3-none-any.whl",
+    )
+    version(
+        "0.7.1",
+        sha256="8972308474c41ed5e0636819f948ebff32f2318e70f7e7d23cd208c4357cc773",
+        url="https://pypi.org/packages/32/0b/3260ac050de07bf6e91871944583bb8598091da19155c34f7ef02244709c/aioitertools-0.7.1-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-flit-core@2:3", type="build")
-    depends_on("py-typing-extensions@3.7:", when="@0.7.1", type=("build", "run"))
-    depends_on("py-typing-extensions@4:", when="@0.11.0: ^python@:3.9", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-typing-extensions@4:", when="@0.9: ^python@:3.9")
+        depends_on("py-typing-extensions@3.7:", when="@0.7")

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

@@ -15,9 +15,12 @@ class PyAioredis(PythonPackage):
 
     license("MIT")
 
-    version("1.3.1", sha256="15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a")
+    version(
+        "1.3.1",
+        sha256="b61808d7e97b7cd5a92ed574937a079c9387fdadd22bfbfa7ad2fd319ecc26e3",
+        url="https://pypi.org/packages/b0/64/1b1612d0a104f21f80eb4c6e1b6075f2e6aba8e228f46f229cfd3fdac859/aioredis-1.3.1-py3-none-any.whl",
+    )
 
-    depends_on("python@3.5:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-async-timeout", type=("build", "run"))
-    depends_on("py-hiredis", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-async-timeout", when="@1:")
+        depends_on("py-hiredis", when="@:1")

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

@@ -15,8 +15,11 @@ class PyAiosignal(PythonPackage):
 
     license("Apache-2.0")
 
-    version("1.2.0", sha256="78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2")
+    version(
+        "1.2.0",
+        sha256="26e62109036cd181df6e6ad646f91f0dcfd05fe16d0cb924138ff2ab75d64e3a",
+        url="https://pypi.org/packages/3b/87/fe94898f2d44a93a35d5aa74671ed28094d80753a1113d68b799fab6dc22/aiosignal-1.2.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-frozenlist@1.1.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-frozenlist@1.1:", when="@1.1:")

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

@@ -14,11 +14,14 @@ class PyAiosqlite(PythonPackage):
 
     license("MIT")
 
-    version("0.17.0", sha256="f0e6acc24bc4864149267ac82fb46dfb3be4455f99fe21df82609cc6e6baee51")
+    version(
+        "0.17.0",
+        sha256="6c49dc6d3405929b1d08eeccc72306d3677503cc5e5e43771efc1e00232e8231",
+        url="https://pypi.org/packages/a0/48/77c0092f716c4bf9460dca44f5120f70b8f71f14a12f40d22551a7152719/aiosqlite-0.17.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-typing-extensions@3.7.2:", type=("build", "run"))
-    depends_on("py-flit-core@2:3", type="build")
+    with default_args(type="run"):
+        depends_on("py-typing-extensions@3.7:", when="@0.16:0.17")
 
     # aiosqlite.test requires aiounittests, not yet in spack
     import_modules = ["aiosqlite"]

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

@@ -14,9 +14,23 @@ class PyAlabaster(PythonPackage):
     pypi = "alabaster/alabaster-0.7.10.tar.gz"
     git = "https://github.com/sphinx-doc/alabaster.git"
 
-    version("0.7.13", sha256="a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2")
-    version("0.7.12", sha256="a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02")
-    version("0.7.10", sha256="37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0")
-    version("0.7.9", sha256="47afd43b08a4ecaa45e3496e139a193ce364571e7e10c6a87ca1a4c57eb7ea08")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.7.13",
+        sha256="1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3",
+        url="https://pypi.org/packages/64/88/c7083fc61120ab661c5d0b82cb77079fc1429d3f913a456c1c82cf4658f7/alabaster-0.7.13-py3-none-any.whl",
+    )
+    version(
+        "0.7.12",
+        sha256="446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359",
+        url="https://pypi.org/packages/10/ad/00b090d23a222943eb0eda509720a404f531a439e803f6538f35136cae9e/alabaster-0.7.12-py2.py3-none-any.whl",
+    )
+    version(
+        "0.7.10",
+        sha256="2eef172f44e8d301d25aff8068fddd65f767a3f04b5f15b0f4922f113aa1c732",
+        url="https://pypi.org/packages/2e/c3/9b7dcd8548cf2c00531763ba154e524af575e8f36701bacfe5bcadc67440/alabaster-0.7.10-py2.py3-none-any.whl",
+    )
+    version(
+        "0.7.9",
+        sha256="d3e64a74919373d6d4d1d36bd717206584cb64cbb0532dfce3bc2081cba6817b",
+        url="https://pypi.org/packages/5d/da/2e59e6b040f1062843eb9e874f504bc6779053b77da5d1ed7f1b46618e13/alabaster-0.7.9-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-alive-progress/package.py

@@ -16,12 +16,19 @@ class PyAliveProgress(PythonPackage):
 
     license("MIT")
 
-    version("2.4.1", sha256="089757c8197f27ad972ba27e1060f6db92368d83c736884e159034fd74865323")
-    version("1.6.2", sha256="642e1ce98becf226c8c36bf24e10221085998c5465a357a66fb83b7dc618b43e")
+    version(
+        "2.4.1",
+        sha256="5503ffca0a0607d5f0d24d3b10a718fe50e375470fa07602b246333eb7ec88ee",
+        url="https://pypi.org/packages/e4/01/7a6bcf3eb3fb030fac47854a984dcc488304af15721df33ce827f25158d1/alive_progress-2.4.1-py3-none-any.whl",
+    )
+    version(
+        "1.6.2",
+        sha256="0f1111f56b1b870f5e5edd57e89fc97dc1ca0a73eb5c5a09533494c7e850a818",
+        url="https://pypi.org/packages/cc/5c/d63b13cc0bd945b4a9b16e921cc00c5657143f68da4f296bb628b8d1ff17/alive_progress-1.6.2-py3-none-any.whl",
+    )
 
-    depends_on("python@2.7:3.8", type=("build", "run"))
-    depends_on("python@3.6:3", type=("build", "run"), when="@2:")
-    depends_on("python@3.7:3", type=("build", "run"), when="@2.2:")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-about-time@3.1.1", type=("build", "run"), when="@2.4.1:")
-    depends_on("py-grapheme@0.6.0", type=("build", "run"), when="@2.4.1:")
+    with default_args(type="run"):
+        depends_on("python@3.7:3", when="@2.2:")
+        depends_on("python@:3", when="@:2.1")
+        depends_on("py-about-time@3.1.1:3.1", when="@2")
+        depends_on("py-grapheme@0.6:", when="@2:")

var/spack/repos/builtin/packages/py-alpaca-eval/package.py

@@ -18,13 +18,17 @@ class PyAlpacaEval(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.2.8", sha256="5b21b74d7362ee229481b6a6d826dd620b2ef6b82e4f5470645e0a4b696a31e6")
+    version(
+        "0.2.8",
+        sha256="a83279fcccfb63b81a60a410b4165291a586b7efde8709ac5a1380917530ac4f",
+        url="https://pypi.org/packages/c9/35/f7d6eb3909fd36ecbf927186a2c23cd257c45dc95dd1314dc2169a7aa9d9/alpaca_eval-0.2.8-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("python@3.10:", type=("build", "run"))
-    depends_on("py-python-dotenv", type=("build", "run"))
-    depends_on("py-datasets", type=("build", "run"))
-    depends_on("py-openai", type=("build", "run"))
-    depends_on("py-pandas", type=("build", "run"))
-    depends_on("py-tiktoken@0.3.2:", type=("build", "run"))
-    depends_on("py-fire", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.10:")
+        depends_on("py-datasets")
+        depends_on("py-fire")
+        depends_on("py-openai", when="@:0.5.1")
+        depends_on("py-pandas")
+        depends_on("py-python-dotenv", when="@0.2.2:")
+        depends_on("py-tiktoken@0.3.2:")

var/spack/repos/builtin/packages/py-alpaca-farm/package.py

@@ -18,24 +18,28 @@ class PyAlpacaFarm(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.1.9", sha256="1039d33c814d0bbbcab6a0e77ed8e897992ad7107d5c4999d56bdad7e0b0a59f")
+    version(
+        "0.1.9",
+        sha256="24ba2fa007205a98f8c7208071e54edcf295a03bb2d19b71a1da27d27dafc537",
+        url="https://pypi.org/packages/15/40/c7098f4ebe1006e2b6843eebfd05f15431d5312dcc37efa785f4089a78d3/alpaca_farm-0.1.9-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("python@3.10:", type=("build", "run"))
-    depends_on("py-datasets", type=("build", "run"))
-    depends_on("py-einops", type=("build", "run"))
-    depends_on("py-nltk", type=("build", "run"))
-    depends_on("py-accelerate@0.18.0:", type=("build", "run"))
-    depends_on("py-tabulate", type=("build", "run"))
-    depends_on("py-transformers@4.26.0:", type=("build", "run"))
-    depends_on("py-statsmodels", type=("build", "run"))
-    depends_on("py-tiktoken@0.3.2:", type=("build", "run"))
-    depends_on("py-markdown", type=("build", "run"))
-    depends_on("py-scikit-learn", type=("build", "run"))
-    depends_on("py-sentencepiece", type=("build", "run"))
-    depends_on("py-pandas", type=("build", "run"))
-    depends_on("py-wandb", type=("build", "run"))
-    depends_on("py-torch@1.13.1:", type=("build", "run"))
-    depends_on("py-fire", type=("build", "run"))
-    depends_on("py-openai", type=("build", "run"))
-    depends_on("py-alpaca-eval@0.2.8:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.10:", when="@0.1.6:")
+        depends_on("py-accelerate@0.18:", when="@:0.1.9")
+        depends_on("py-alpaca-eval@0.2.8:", when="@0.1.9:0.1")
+        depends_on("py-datasets")
+        depends_on("py-einops")
+        depends_on("py-fire")
+        depends_on("py-markdown")
+        depends_on("py-nltk")
+        depends_on("py-openai")
+        depends_on("py-pandas")
+        depends_on("py-scikit-learn")
+        depends_on("py-sentencepiece")
+        depends_on("py-statsmodels")
+        depends_on("py-tabulate")
+        depends_on("py-tiktoken@0.3.2:")
+        depends_on("py-torch@1.13.1:")
+        depends_on("py-transformers@4.26:", when="@:0.1.9")
+        depends_on("py-wandb")

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

@@ -13,28 +13,62 @@ class PyAltair(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("5.2.0", sha256="2ad7f0c8010ebbc46319cc30febfb8e59ccf84969a201541c207bc3a4fa6cf81")
-    version("5.1.2", sha256="e5f52a71853a607c61ce93ad4a414b3d486cd0d46ac597a24ae8bd1ac99dd460")
-    version("5.1.1", sha256="ad6cd6983c8db69a34dd68e42653f6172b7fc3775b7190005107f1b4fc60d64d")
-    version("5.1.0", sha256="46d2b1a9fa29eeed24513262cb1de13a40d55c04580fc21799d5de3991fea8ff")
-    version("5.0.1", sha256="087d7033cb2d6c228493a053e12613058a5d47faf6a36aea3ff60305fd8b4cb0")
-    version("5.0.0", sha256="394c3d8be96f9cc90e15a0eee3634cc5b6f19e470fd2045759892623bd9a3fb2")
-    version("4.2.2", sha256="39399a267c49b30d102c10411e67ab26374156a84b1aeb9fcd15140429ba49c5")
-    version("4.2.1", sha256="4939fd9119c57476bf305af9ca0bd1aa7779b2450b874d3623660e879d0fcad1")
-    version("4.2.0", sha256="d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026")
+    version(
+        "5.2.0",
+        sha256="8c4888ad11db7c39f3f17aa7f4ea985775da389d79ac30a6c22856ab238df399",
+        url="https://pypi.org/packages/c5/e4/7fcceef127badbb0d644d730d992410e4f3799b295c9964a172f92a469c7/altair-5.2.0-py3-none-any.whl",
+    )
+    version(
+        "5.1.2",
+        sha256="7219708ec33c152e53145485040f428954ed15fd09b2a2d89e543e6d111dae7f",
+        url="https://pypi.org/packages/17/16/b12fca347ff9d062e3c44ad9641d2ec50364570a059f3078ada3a5119d7a/altair-5.1.2-py3-none-any.whl",
+    )
+    version(
+        "5.1.1",
+        sha256="bb421459b53c80ad45f2bd009c87da2a81165b8f7d5a90658e0fc1ffc741bf34",
+        url="https://pypi.org/packages/f2/b4/02a0221bd1da91f6e6acdf0525528db24b4b326a670a9048da474dfe0667/altair-5.1.1-py3-none-any.whl",
+    )
+    version(
+        "5.1.0",
+        sha256="af1d502fa27a400ab4c82c55a185b4eaa74f1146f619e53278ba19934e90510a",
+        url="https://pypi.org/packages/2b/40/ff33821bca16cac30f8d9c3244ac961416f40bf2d3261a1250aabda33a6f/altair-5.1.0-py3-none-any.whl",
+    )
+    version(
+        "5.0.1",
+        sha256="9f3552ed5497d4dfc14cf48a76141d8c29ee56eae2873481b4b28134268c9bbe",
+        url="https://pypi.org/packages/b2/20/5c3b89d6f8d9938325a9330793438389e0dc94c34d921f6da35ec62095f3/altair-5.0.1-py3-none-any.whl",
+    )
+    version(
+        "5.0.0",
+        sha256="e7deed321f61a3ec752186ae96e97b44a1353de142928c1934fb211e9f0bfe9e",
+        url="https://pypi.org/packages/2e/b8/49d377d9a7a85dc24e35d70384fc5ae7b19db6f8ee9d23d36337675c602e/altair-5.0.0-py3-none-any.whl",
+    )
+    version(
+        "4.2.2",
+        sha256="8b45ebeaf8557f2d760c5c77b79f02ae12aee7c46c27c06014febab6f849bc87",
+        url="https://pypi.org/packages/18/62/47452306e84d4d2e67f9c559380aeb230f5e6ca84fafb428dd36b96a99ba/altair-4.2.2-py3-none-any.whl",
+    )
+    version(
+        "4.2.1",
+        sha256="67e099a651c78028c4e135e3b5bd9680ed7dd928ca7b61c9c7376c58e41d2b02",
+        url="https://pypi.org/packages/17/18/1e20c890bc12dfdd633cc58d76101fd544cc8f58fc316f2f6e13c6a83af2/altair-4.2.1-py3-none-any.whl",
+    )
+    version(
+        "4.2.0",
+        sha256="0c724848ae53410c13fa28be2b3b9a9dcb7b5caa1a70f7f217bd663bb419935a",
+        url="https://pypi.org/packages/0a/fb/56aaac0c69d106e380ff868cd5bb6cccacf2b8917a8527532bc89804a52e/altair-4.2.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:", type=("build", "run"))
-    depends_on("py-setuptools@40.6:", type="build", when="@:4")
-    depends_on("py-entrypoints", type=("build", "run"), when="@2.0.0:4")
-
-    depends_on("py-hatchling", type=("build"), when="@5.0.0:")
-
-    depends_on("py-importlib-metadata", type=("build", "run"), when="@5.0.0:5.0")
-    depends_on("py-typing-extensions@4.0.1:", type=("build", "run"), when="@5.0.0: ^python@:3.10")
-    depends_on("py-jinja2", type=("build", "run"))
-    depends_on("py-jsonschema@3.0.0:", type=("build", "run"))
-    depends_on("py-numpy", type=("build", "run"))
-    depends_on("py-pandas@0.18:", type=("build", "run"))
-    depends_on("py-pandas@0.25:", type=("build", "run"), when="@5.1.0:")
-    depends_on("py-toolz", type=("build", "run"))
-    depends_on("py-packaging", type=("build", "run"), when="@5.1.0:")
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@5.1:")
+        depends_on("python@3.7:", when="@4.2:5.0")
+        depends_on("py-entrypoints", when="@:4")
+        depends_on("py-importlib-metadata", when="@5:5.0 ^python@:3.7")
+        depends_on("py-jinja2")
+        depends_on("py-jsonschema@3.0.0:", when="@4.2.0:5.0.0-rc2,5.0.0:")
+        depends_on("py-numpy")
+        depends_on("py-packaging", when="@5.1:")
+        depends_on("py-pandas@0.25.0:", when="@5.1:")
+        depends_on("py-pandas@0.18:", when="@4.1:5.0")
+        depends_on("py-toolz")
+        depends_on("py-typing-extensions@4.0.1:", when="@5: ^python@:3.10")

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

@@ -17,6 +17,8 @@ class PyAltgraph(PythonPackage):
 
     license("MIT")
 
-    version("0.16.1", sha256="ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.16.1",
+        sha256="d6814989f242b2b43025cba7161fc1b8fb487a62cd49c49245d6fd01c18ac997",
+        url="https://pypi.org/packages/0a/cc/646187eac4b797069e2e6b736f14cdef85dbe405c9bfc7803ef36e4f62ef/altgraph-0.16.1-py2.py3-none-any.whl",
+    )

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

@@ -15,7 +15,11 @@ class PyAmpltools(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.4.6", sha256="d54b399c1d78d02e3f4023aa2335b57832deb7d31cdefe4e219e4f2a2bb19a83")
+    version(
+        "0.4.6",
+        sha256="a0c7a21a0492f6809bb866f9887b8ad29b28ce43ea0c2f564562eb883bca34e9",
+        url="https://pypi.org/packages/2e/ce/5d7ac093633c8b73e7bfdf34cee14b5dea44e322bf2c938acdfadbb0d735/ampltools-0.4.6-py3-none-any.whl",
+    )
 
-    depends_on("py-requests", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    with default_args(type="run"):
+        depends_on("py-requests")

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

@@ -13,21 +13,38 @@ class PyAmqp(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("5.0.9", sha256="1e5f707424e544078ca196e72ae6a14887ce74e02bd126be54b7c03c971bef18")
-    version("5.0.1", sha256="9881f8e6fe23e3db9faa6cfd8c05390213e1d1b95c0162bc50552cad75bffa5f")
-    version("2.6.1", sha256="70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21")
-    version("2.5.2", sha256="77f1aef9410698d20eaeac5b73a87817365f457a507d82edf292e12cbb83b08d")
-    version("2.4.2", sha256="043beb485774ca69718a35602089e524f87168268f0d1ae115f28b88d27f92d7")
-    version("2.4.1", sha256="6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb")
+    version(
+        "5.0.9",
+        sha256="9cd81f7b023fc04bbb108718fbac674f06901b77bfcdce85b10e2a5d0ee91be5",
+        url="https://pypi.org/packages/b9/80/76cc2ce4789c91394f43e0e78d86be5738b5223d106c11d78bacc260a559/amqp-5.0.9-py3-none-any.whl",
+    )
+    version(
+        "5.0.1",
+        sha256="a8fb8151eb9d12204c9f1784c0da920476077609fa0a70f2468001e3a4258484",
+        url="https://pypi.org/packages/6a/10/2d781823dd1366d7609148714e1a81af402c3c4d0ef52c1a1ac0716da9d0/amqp-5.0.1-py2.py3-none-any.whl",
+    )
+    version(
+        "2.6.1",
+        sha256="aa7f313fb887c91f15474c1229907a04dac0b8135822d6603437803424c0aa59",
+        url="https://pypi.org/packages/bc/90/bb5ce93521772f083cb2d7a413bb82eda5afc62b4192adb7ea4c7b4858b9/amqp-2.6.1-py2.py3-none-any.whl",
+    )
+    version(
+        "2.5.2",
+        sha256="6e649ca13a7df3faacdc8bbb280aa9a6602d22fd9d545336077e573a1f4ff3b8",
+        url="https://pypi.org/packages/fc/a0/6aa2a7923d4e82dda23db27711d565f0c4abf1570859f168e3d0975f1eb6/amqp-2.5.2-py2.py3-none-any.whl",
+    )
+    version(
+        "2.4.2",
+        sha256="35a3b5006ca00b21aaeec8ceea07130f07b902dd61bfe42815039835f962f5f1",
+        url="https://pypi.org/packages/42/ec/cbbaa8f75be8cbd019afb9d63258e2bdc95242f8c46a54bb90db5fef03bd/amqp-2.4.2-py2.py3-none-any.whl",
+    )
+    version(
+        "2.4.1",
+        sha256="16056c952e8029ce8db097edf0d7c2fe2ba9de15d30ba08aee2c5221273d8e23",
+        url="https://pypi.org/packages/27/32/5c8a0d355b247446eb73f89c0fa4a22c1832764c0cc9d2bc43b9256d9366/amqp-2.4.1-py2.py3-none-any.whl",
+    )
 
-    depends_on("python@2.7:2.8,3.5:", type=("build", "run"))
-    depends_on("python@3.6:", type=("build", "run"), when="@5.0.9:")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-cython", type="build")
-
-    depends_on("py-vine@1.1.3:4", when="@2", type=("build", "run"))
-    depends_on("py-vine@5.0.0", when="@5.0.0:5", type=("build", "run"))
-
-    def setup_build_environment(self, env):
-        env.set("CELERY_ENABLE_SPEEDUPS", True)
+    with default_args(type="run"):
+        depends_on("py-vine@5.0.0:5.0", when="@5.0.1:5.0")
+        depends_on("py-vine@1.1.3:1", when="@2.5:2")
+        depends_on("py-vine@1.1.3:", when="@2.2:2.4")

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

@@ -14,7 +14,13 @@ class PyAniso8601(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("9.0.1", sha256="72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973")
-    version("7.0.0", sha256="513d2b6637b7853806ae79ffaca6f3e8754bdd547048f5ccc1420aec4b714f1e")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "9.0.1",
+        sha256="1d2b7ef82963909e93c4f24ce48d4de9e66009a21bf1c1e1c85bdd0812fe412f",
+        url="https://pypi.org/packages/e3/04/e97c12dc034791d7b504860acfcdd2963fa21ae61eaca1c9d31245f812c3/aniso8601-9.0.1-py2.py3-none-any.whl",
+    )
+    version(
+        "7.0.0",
+        sha256="d10a4bf949f619f719b227ef5386e31f49a2b6d453004b21f02661ccc8670c7b",
+        url="https://pypi.org/packages/45/a4/b4fcadbdab46c2ec2d2f6f8b4ab3f64fd0040789ac7f065eba82119cd602/aniso8601-7.0.0-py2.py3-none-any.whl",
+    )

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

@@ -15,16 +15,19 @@ class PyAnndata(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.8.0", sha256="94d2cc6f76c0317c0ac28564e3092b313b7ad19c737d66701961f3e620b9066e")
+    version(
+        "0.8.0",
+        sha256="2a929360c3c893370865e8ee3d3b9d95ee93239da91bafc5bf5f3c306796746e",
+        url="https://pypi.org/packages/46/7f/ffe1546142d98ed55e7bb70eaedad92861d8e2ab07398ef7f06f4f46d06d/anndata-0.8.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:", type=("build", "run"))
-    depends_on("py-setuptools-scm", type="build")
-    depends_on("py-flit-core@3.4:3", type="build")
-    depends_on("py-importlib-metadata@0.7:", type=("build", "run"), when="^python@:3.7")
-    depends_on("py-pandas@1.1.1:", type=("build", "run"))
-    depends_on("py-numpy@1.16.5:", type=("build", "run"))
-    depends_on("py-scipy@1.4.1:", type=("build", "run"))
-    depends_on("py-h5py@3:", type=("build", "run"))
-    depends_on("py-natsort", type=("build", "run"))
-    depends_on("py-packaging@20:", type=("build", "run"))
-    depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@0.8")
+        depends_on("py-h5py@3.0.0:", when="@0.8:0.10.5")
+        depends_on("py-importlib-metadata@0.7:", when="@:0.8 ^python@:3.7")
+        depends_on("py-natsort")
+        depends_on("py-numpy@1.16.5:", when="@0.7.6:0.10.5")
+        depends_on("py-packaging@20:", when="@0.7.6:")
+        depends_on("py-pandas@1.1.1:", when="@0.7.6:0.9.1")
+        depends_on("py-scipy@1.4.1:", when="@0.7.6:0.10.5")
+        depends_on("py-typing-extensions", when="@0.8 ^python@:3.7")

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

@@ -14,9 +14,16 @@ class PyAnnexremote(PythonPackage):
 
     license("GPL-3.0-only")
 
-    version("1.6.0", sha256="779a43e5b1b4afd294761c6587dee8ac68f453a5a8cc40f419e9ca777573ae84")
-    version("1.5.0", sha256="92f32b6f5461cbaeefe0c60b32f9c1e0c1dbe4e57b8ee425affb56f4060f64ef")
+    version(
+        "1.6.0",
+        sha256="bc5bd2e456d64679e33d71226705673ac213040f8ae495467e9629b550c2ca53",
+        url="https://pypi.org/packages/66/81/32d0563cd017cca305a8b8883abb177880cedde1385213a6b4b33cc07e45/annexremote-1.6.0-py3-none-any.whl",
+    )
+    version(
+        "1.5.0",
+        sha256="5aa99e37036c84547cc1f39eb3f99bf4079f1e5de1272b147e8dd32c0e14884f",
+        url="https://pypi.org/packages/cd/9c/ced3458fcd0bb048350b7048412f6fa732ca7c44f6389d68c15e96e8b216/annexremote-1.5.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3:", when="@1.6:", type="build")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-future", when="@:1.5", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-future", when="@1.3:1.5")

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

@@ -16,7 +16,8 @@ class PyAnsi2html(PythonPackage):
 
     license("LGPL-3.0-or-later")
 
-    version("1.6.0", sha256="0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-pip", type="build")
+    version(
+        "1.6.0",
+        sha256="9fa44ca8fb8c417a05a9af1c62e192694b0fcec269ab55f130b5b26e260d0b7c",
+        url="https://pypi.org/packages/c6/85/3a46be84afbb16b392a138cd396117f438c7b2e91d8dc327621d1ae1b5dc/ansi2html-1.6.0-py3-none-any.whl",
+    )

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

@@ -16,9 +16,16 @@ class PyAnsimarkup(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("2.1.0", sha256="7b3e3d93fecc5b64d23a6e8eb96dbc8b0b576a211829d948afb397d241a8c51b")
-    version("1.5.0", sha256="96c65d75bbed07d3dcbda8dbede8c2252c984f90d0ca07434b88a6bbf345fad3")
+    version(
+        "2.1.0",
+        sha256="51ab9f3157125c53e93d8fd2e92df37dfa1757c9f2371ed48554e111c7d4401a",
+        url="https://pypi.org/packages/60/99/878823a360a0bd9ae034d39fe37f8fdd976de8da642c2ec608f093efc273/ansimarkup-2.1.0-py3-none-any.whl",
+    )
+    version(
+        "1.5.0",
+        sha256="3146ca74af5f69e48a9c3d41b31085c0d6378f803edeb364856d37c11a684acf",
+        url="https://pypi.org/packages/22/09/3ad81e40d752ef51a9a8c320c9385de0d98a4dad68c0e4f793befc610f56/ansimarkup-1.5.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools@61:", type="build", when="@2.1.0")
-    depends_on("py-colorama", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-colorama", when="@1.4.1:")

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

@@ -14,7 +14,8 @@ class PyAnsiwrap(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.8.4", sha256="ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-textwrap3@0.9.2:", type=("build", "run"))
+    version(
+        "0.8.4",
+        sha256="7b053567c88e1ad9eed030d3ac41b722125e4c1271c8a99ade797faff1f49fb1",
+        url="https://pypi.org/packages/03/50/43e775a63e0d632d9be3b3fa1c9b2cbaf3b7870d203655710a3426f47c26/ansiwrap-0.8.4-py2.py3-none-any.whl",
+    )

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

@@ -15,7 +15,11 @@ class PyAnytree(PythonPackage):
 
     license("Apache-2.0")
 
-    version("2.8.0", sha256="3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab")
+    version(
+        "2.8.0",
+        sha256="14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521",
+        url="https://pypi.org/packages/a8/65/be23d8c3ecd68d40541d49812cd94ed0f3ee37eb88669ca15df0e43daed1/anytree-2.8.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-six@1.9.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-six@1.9:", when="@2.5,2.7:2.7.0,2.7.3:2.8")

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

@@ -14,6 +14,8 @@ class PyApacheLibcloud(PythonPackage):
 
     license("Apache-2.0")
 
-    version("1.2.1", sha256="b26b542c6c9785dd4e34892d87421ffa4c043335c1cba301a97a8d9748c423f2")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "1.2.1",
+        sha256="6506e51eefe24a0bc0e61699dae7f390e22105e14afc4ba18248748c66117419",
+        url="https://pypi.org/packages/2d/32/37c9a6373595e1f335872e0a3ea76420db9c3952e185daff851d209c3b5d/apache_libcloud-1.2.1-py2.py3-none-any.whl",
+    )

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

@@ -15,9 +15,12 @@ class PyApeyeCore(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("1.1.4", sha256="72bb89fed3baa647cb81aa28e1d851787edcbf9573853b5d2b5f87c02f50eaf5")
+    version(
+        "1.1.4",
+        sha256="084bc696448d3ac428fece41c1f2eb08fa9d9ce1d1b2f4d43187e3def4528a60",
+        url="https://pypi.org/packages/f4/af/7cfe2c5e01d70848ac1731c8ab37e0e49ab39cf18e595446c192349639c0/apeye_core-1.1.4-py3-none-any.whl",
+    )
 
-    depends_on("py-hatch-requirements-txt", type="build")
-    depends_on("py-hatchling", type="build")
-    depends_on("py-domdf-python-tools@2.6:", type=("build", "run"))
-    depends_on("py-idna@2.5:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-domdf-python-tools@2.6:")
+        depends_on("py-idna@2.5:")

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

@@ -15,10 +15,14 @@ class PyApeye(PythonPackage):
 
     license("LGPL-3.0-or-later")
 
-    version("1.4.1", sha256="14ea542fad689e3bfdbda2189a354a4908e90aee4bf84c15ab75d68453d76a36")
+    version(
+        "1.4.1",
+        sha256="44e58a9104ec189bf42e76b3a7fe91e2b2879d96d48e9a77e5e32ff699c9204e",
+        url="https://pypi.org/packages/89/7b/2d63664777b3e831ac1b1d8df5bbf0b7c8bee48e57115896080890527b1b/apeye-1.4.1-py3-none-any.whl",
+    )
 
-    depends_on("py-flit-core@3.2:3", type="build")
-    depends_on("py-apeye-core@1:", type=("build", "run"))
-    depends_on("py-domdf-python-tools@2.6:", type=("build", "run"))
-    depends_on("py-platformdirs@2.3:", type=("build", "run"))
-    depends_on("py-requests@2.24:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-apeye-core@1.0.0-beta2:", when="@1.3:")
+        depends_on("py-domdf-python-tools@2.6:", when="@1.2:")
+        depends_on("py-platformdirs@2.3:", when="@1.2:")
+        depends_on("py-requests@2.24:")

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

@@ -13,9 +13,13 @@ class PyApipkg(PythonPackage):
 
     license("MIT")
 
-    version("1.5", sha256="37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6")
-    version("1.4", sha256="2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6")
-
-    depends_on("py-setuptools@30.3.0:", type="build")
-    depends_on("py-setuptools-scm", type="build")
-    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
+    version(
+        "1.5",
+        sha256="58587dd4dc3daefad0487f6d9ae32b4542b185e1c36db6993290e7c41ca2b47c",
+        url="https://pypi.org/packages/67/08/4815a09603fc800209431bec5b8bd2acf2f95abdfb558a44a42507fb94da/apipkg-1.5-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4",
+        sha256="65d2aa68b28e7d31233bb2ba8eb31cda40e4671f8ac2d6b241e358c9652a74b9",
+        url="https://pypi.org/packages/94/72/fd4f2e46ce7b0d388191c819ef691c8195fab09602bbf1a2f92aa5351444/apipkg-1.4-py2.py3-none-any.whl",
+    )

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

@@ -15,10 +15,17 @@ class PyApispec(PythonPackage):
 
     license("MIT")
 
-    version("6.0.2", sha256="e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887")
-    version("4.7.1", sha256="79029486d36a0d7f3c659dbf6ae50a91fbed0c22dcd5376f592e076c130bc7f9")
+    version(
+        "6.0.2",
+        sha256="d97f0ae9c65133185b9ed9c5be1a434eb85627dfa33c4c53cabda122256c1b67",
+        url="https://pypi.org/packages/06/05/397d3da7d64c095d38d75b95aacd76d22f7491184f7e2910e8ce79f068f8/apispec-6.0.2-py3-none-any.whl",
+    )
+    version(
+        "4.7.1",
+        sha256="6613dbc39f41cd58942a697f11c8762ba18422bd173fe0bdfc1535b83d3f84f0",
+        url="https://pypi.org/packages/3f/5b/312dd28e8e0b94dfe3c41db5a5c83a944c938a2108d631613fa0bbe3c8f7/apispec-4.7.1-py2.py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-
-    depends_on("py-packaging@21.3:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@5.2:6.3")
+        depends_on("py-packaging@21.3:", when="@6:")

var/spack/repos/builtin/packages/py-appdirs/decode-appdirs.patch

@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 293c1c4..122cd04 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2,6 +2,7 @@
- import sys
- import os
- import os.path
-+from io import open
- # appdirs is a dependency of setuptools, so allow installing without it.
- try:
-     from setuptools import setup
-@@ -15,7 +16,7 @@ if sys.version_info < (2, 7):
- 
- 
- def read(fname):
--    inf = open(os.path.join(os.path.dirname(__file__), fname))
-+    inf = open(os.path.join(os.path.dirname(__file__), fname), encoding='utf8')
-     out = "\n" + inf.read().replace("\r\n", "\n")
-     inf.close()
-     return out

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

@@ -15,10 +15,18 @@ class PyAppdirs(PythonPackage):
 
     license("MIT")
 
-    version("1.4.4", sha256="7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41")
-    version("1.4.3", sha256="9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92")
-    version("1.4.0", sha256="8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5")
-
-    patch("setuptools-import.patch", when="@:1.4.0")
-    patch("decode-appdirs.patch", when="@1.4.4")
-    depends_on("py-setuptools", type="build")
+    version(
+        "1.4.4",
+        sha256="a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128",
+        url="https://pypi.org/packages/3b/00/2344469e2084fb287c2e0b57b72910309874c3245463acd6cf5e3db69324/appdirs-1.4.4-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.3",
+        sha256="d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e",
+        url="https://pypi.org/packages/56/eb/810e700ed1349edde4cbdc1b2a21e28cdf115f9faf263f6bbf8447c1abf3/appdirs-1.4.3-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.0",
+        sha256="85e58578db8f29538f3109c11250c2a5514a2fcdc9890d9b2fe777eb55517736",
+        url="https://pypi.org/packages/7b/8b/eebc6e2002a1e0383f1c7108d0111d4d33ea93bf417d7e19e43ec9b87b2b/appdirs-1.4.0-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-appdirs/setuptools-import.patch

@@ -1,17 +0,0 @@
-diff --git a/setup.py b/setup.py
-index ccd1e72..5d907aa 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2,7 +2,11 @@
- import sys
- import os
- import os.path
--from setuptools import setup
-+# appdirs is a dependency of setuptools, so allow installing without it.
-+try:
-+    from setuptools import setup
-+except ImportError:
-+    from distutils.core import setup
- import appdirs
-
- tests_require = []

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

@@ -28,6 +28,8 @@ class PyApplicationinsights(PythonPackage):
 
     license("MIT")
 
-    version("0.11.9", sha256="30a11aafacea34f8b160fbdc35254c9029c7e325267874e3c68f6bdbcd6ed2c3")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.11.9",
+        sha256="b88bc5a41385d8e516489128d5e63f8c52efe597a3579b1718d1ab2f7cf150a2",
+        url="https://pypi.org/packages/a1/53/234c53004f71f0717d8acd37876e0b65c121181167057b9ce1b1795f96a0/applicationinsights-0.11.9-py2.py3-none-any.whl",
+    )

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

@@ -12,7 +12,13 @@ class PyAppnope(PythonPackage):
     homepage = "https://github.com/minrk/appnope"
     pypi = "appnope/appnope-0.1.0.tar.gz"
 
-    version("0.1.3", sha256="02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24")
-    version("0.1.0", sha256="8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.1.3",
+        sha256="265a455292d0bd8a72453494fa24df5a11eb18373a60c7c0430889f22548605e",
+        url="https://pypi.org/packages/41/4a/381783f26df413dde4c70c734163d88ca0550a1361cb74a1c68f47550619/appnope-0.1.3-py2.py3-none-any.whl",
+    )
+    version(
+        "0.1.0",
+        sha256="5b26757dc6f79a3b7dc9fab95359328d5747fcb2409d331ea66d0272b90ab2a0",
+        url="https://pypi.org/packages/87/a9/7985e6a53402f294c8f0e8eff3151a83f1fb901fa92909bb3ff29b4d22af/appnope-0.1.0-py2.py3-none-any.whl",
+    )

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

@@ -17,10 +17,26 @@ class PyArchspec(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.2.3", sha256="d07deb5b6e2ab3b74861e217523d02e69be8522f6e6565f4cc5d2062eb1a5d2c")
-    version("0.2.2", sha256="d922c9fd80a5234d8cef883fbe0e146b381c449062c0405f91714ebad1edc035")
-    version("0.2.1", sha256="0974a8a95831d2d43cce906c5b79a35d5fd2bf9be478b0e3b7d83ccc51ac815e")
-    version("0.2.0", sha256="6aaba5ebdb5c3633c400d8c221a6a18716da0c64b367a8509f4217b22e91a5f5")
+    version(
+        "0.2.3",
+        sha256="1b76fe2e75ee8750f0aac8c728af4beca1a95bdb5df246f4d39263664d6d301f",
+        url="https://pypi.org/packages/36/a6/7f0f500ce427b19c25f8cc05ee8cff9fb635373d62ae39e446d6f789e882/archspec-0.2.3-py3-none-any.whl",
+    )
+    version(
+        "0.2.2",
+        sha256="1054b599abb66f4d141c7a278dd34beb5766b1c84c7595aab3907a5bf55ee258",
+        url="https://pypi.org/packages/57/c1/45410841aaafe218632cfb9ae946eb4007ac8b5136bcae2987f0f56c7f56/archspec-0.2.2-py3-none-any.whl",
+    )
+    version(
+        "0.2.1",
+        sha256="e135481fc8384141ea2a18df9843045951717d8d029d60474a65d7d89b210821",
+        url="https://pypi.org/packages/63/ae/333e7d216dda9134558ddc30792d96bfc58968ff5cc69b4ad9e02dfac654/archspec-0.2.1-py3-none-any.whl",
+    )
+    version(
+        "0.2.0",
+        sha256="6e820d5afc45fe051b7f2c07aa2ede68ea55ae67c27ba78ca795da8e3671f9cc",
+        url="https://pypi.org/packages/9d/94/4c7f18613a052d5fbcb58bb1f938d3b1a04874c1464bfb63a26fe24435aa/archspec-0.2.0-py3-none-any.whl",
+    )
 
-    depends_on("py-poetry-core@1.0.0:", type="build")
-    depends_on("py-click@8", type=("build", "run"), when="@:0.2.0")
+    with default_args(type="run"):
+        depends_on("py-click@8.0.0:", when="@0.2:0.2.0")

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

@@ -15,6 +15,8 @@ class PyArcp(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.2.1", sha256="5c17ac7972c9ef82979cc2caf2b3a87c1aefd3fefe9adb8a5dd728ada57715dd")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.2.1",
+        sha256="4e09b2d8a9fc3fda7ec112b553498ff032ea7de354e27dbeb1acc53667122444",
+        url="https://pypi.org/packages/66/df/32574bc8f1d440d40f4aaf3b455316b2b1536c7243c985a90f8516cf3074/arcp-0.2.1-py2.py3-none-any.whl",
+    )

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

@@ -12,21 +12,36 @@ class PyArgcomplete(PythonPackage):
     homepage = "https://github.com/kislyuk/argcomplete"
     pypi = "argcomplete/argcomplete-1.12.0.tar.gz"
 
-    version("3.1.2", sha256="d5d1e5efd41435260b8f85673b74ea2e883affcbec9f4230c582689e8e78251b")
-    version("3.0.8", sha256="b9ca96448e14fa459d7450a4ab5a22bbf9cee4ba7adddf03e65c398b5daeea28")
-    version("2.0.0", sha256="6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20")
-    version("1.12.3", sha256="2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445")
-    version("1.12.0", sha256="2fbe5ed09fd2c1d727d4199feca96569a5b50d44c71b16da9c742201f7cc295c")
-    version("1.1.1", sha256="cca45b5fe07000994f4f06a0b95bd71f7b51b04f81c3be0b4ea7b666e4f1f084")
-
-    depends_on("py-setuptools@67.7.2:", when="@3.1:", type="build")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools-scm+toml@6.2:", when="@3.1:", type="build")
-
-    depends_on("py-importlib-metadata@0.23:6", when="@3.0.6: ^python@:3.7", type=("build", "run"))
-    depends_on(
-        "py-importlib-metadata@0.23:4", when="@1.12.3:2 ^python@:3.7", type=("build", "run")
+    version(
+        "3.1.2",
+        sha256="d97c036d12a752d1079f190bc1521c545b941fda89ad85d15afa909b4d1b9a99",
+        url="https://pypi.org/packages/1e/05/223116a4a5905d6b26bff334ffc7b74474fafe23fcb10532caf0ef86ca69/argcomplete-3.1.2-py3-none-any.whl",
     )
-    depends_on("py-importlib-metadata@0.23:3", when="@1.12.2 ^python@:3.7", type=("build", "run"))
-    depends_on("py-importlib-metadata@0.23:2", when="@1.12.1 ^python@:3.7", type=("build", "run"))
-    depends_on("py-importlib-metadata@0.23:1", when="@1.12.0 ^python@:3.7", type=("build", "run"))
+    version(
+        "3.0.8",
+        sha256="e36fd646839933cbec7941c662ecb65338248667358dd3d968405a4506a60d9b",
+        url="https://pypi.org/packages/ab/ce/2141e1cabe39c90e01fde7feb44c07867fb49bf1c0c091d68fd8924fd6a2/argcomplete-3.0.8-py3-none-any.whl",
+    )
+    version(
+        "2.0.0",
+        sha256="cffa11ea77999bb0dd27bb25ff6dc142a6796142f68d45b1a26b11f58724561e",
+        url="https://pypi.org/packages/d3/e5/c5509683462e51b070df9e83e7f72c1ccfe3f733f328b4a0f06804c27278/argcomplete-2.0.0-py2.py3-none-any.whl",
+    )
+    version(
+        "1.12.3",
+        sha256="291f0beca7fd49ce285d2f10e4c1c77e9460cf823eef2de54df0c0fec88b0d81",
+        url="https://pypi.org/packages/b7/9e/9dc74d330c07866d72f62d553fe8bdbe32786ff247a14e68b5659963e6bd/argcomplete-1.12.3-py2.py3-none-any.whl",
+    )
+    version(
+        "1.12.0",
+        sha256="91dc7f9c7f6281d5a0dce5e73d2e33283aaef083495c13974a7dd197a1cdc949",
+        url="https://pypi.org/packages/89/4d/b8e035cca2c9b2484ac12d20e0fb68019e17f0b09918f2765e0a381127fb/argcomplete-1.12.0-py2.py3-none-any.whl",
+    )
+    version(
+        "1.1.1",
+        sha256="f9bb1e017aa61e52b28023936475963d97d62046a1f87e0f0dfc5a5b439949ff",
+        url="https://pypi.org/packages/b2/64/f622fc5e6a202f802343cf6363fe0ff6a1e7f99cd7e0184a71f038cdbb4e/argcomplete-1.1.1-py2.py3-none-any.whl",
+    )
+
+    with default_args(type="run"):
+        depends_on("py-importlib-metadata@0.23:6", when="@3.1:3.1.2 ^python@:3.7")

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

@@ -20,6 +20,8 @@ class PyArgh(PythonPackage):
 
     maintainers("dorton21")
 
-    version("0.26.2", sha256="e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.26.2",
+        sha256="a9b3aaa1904eeb78e32394cd46c6f37ac0fb4af6dc488daa58971bdc7d7fcaf3",
+        url="https://pypi.org/packages/06/1c/e667a7126f0b84aaa1c56844337bf0ac12445d1beb9c8a6199a7314944bf/argh-0.26.2-py2.py3-none-any.whl",
+    )

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

@@ -15,6 +15,11 @@ class PyArgparseDataclass(PythonPackage):
 
     license("MIT")
 
-    version("2.0.0", sha256="09ab641c914a2f12882337b9c3e5086196dbf2ee6bf0ef67895c74002cc9297f")
+    version(
+        "2.0.0",
+        sha256="3ffc8852a88d9d98d1364b4441a712491320afb91fb56049afd8a51d74bb52d2",
+        url="https://pypi.org/packages/b3/66/e6c0a808950ba5a4042e2fcedd577fc7401536c7db063de4d7c36be06f84/argparse_dataclass-2.0.0-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@2:")

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

@@ -19,16 +19,38 @@ class PyArrow(PythonPackage):
 
     license("Apache-2.0")
 
-    version("1.2.3", sha256="3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1")
-    version("1.2.2", sha256="05caf1fd3d9a11a1135b2b6f09887421153b94558e5ef4d090b567b47173ac2b")
-    version("1.2.1", sha256="c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840")
-    version("0.16.0", sha256="92aac856ea5175c804f7ccb96aca4d714d936f1c867ba59d747a8096ec30e90a")
-    version("0.14.7", sha256="67f8be7c0cf420424bc62d8d7dc40b44e4bb2f7b515f9cc2954fb36e35797656")
-    version("0.14.1", sha256="2d30837085011ef0b90ff75aa0a28f5c7d063e96b7e76b6cbc7e690310256685")
+    version(
+        "1.2.3",
+        sha256="5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2",
+        url="https://pypi.org/packages/67/67/4bca5a595e2f89bff271724ddb1098e6c9e16f7f3d018d120255e3c30313/arrow-1.2.3-py3-none-any.whl",
+    )
+    version(
+        "1.2.2",
+        sha256="d622c46ca681b5b3e3574fcb60a04e5cc81b9625112d5fb2b44220c36c892177",
+        url="https://pypi.org/packages/36/e7/3043959c8e3e3d6e346b69417e85daa591f9c018b99c383cc3f316bbf269/arrow-1.2.2-py3-none-any.whl",
+    )
+    version(
+        "1.2.1",
+        sha256="6b2914ef3997d1fd7b37a71ce9dd61a6e329d09e1c7b44f4d3099ca4a5c0933e",
+        url="https://pypi.org/packages/f4/97/a6b394b0ee6c9a7f645308f3a205c6cfe4fc804aac1bf29e4aebb5cd5a16/arrow-1.2.1-py3-none-any.whl",
+    )
+    version(
+        "0.16.0",
+        sha256="98184d8dd3e5d30b96c2df4596526f7de679ccb467f358b82b0f686436f3a6b8",
+        url="https://pypi.org/packages/ed/d2/aa994f2d8dd442113c753041761dc0732a35def05538de48f61adb28642a/arrow-0.16.0-py2.py3-none-any.whl",
+    )
+    version(
+        "0.14.7",
+        sha256="4bfacea734ead51495dc47df00421ecfd4ca1f2c0fbe58b9a26eaeddedc31caf",
+        url="https://pypi.org/packages/b9/26/aff20e20eb4fc8f9cbe60434494b53b8cc327062585517461bfdff76125f/arrow-0.14.7-py2.py3-none-any.whl",
+    )
+    version(
+        "0.14.1",
+        sha256="e4c4157d9f5eb7f850ffdcedd0cc1454ff677881deee03434a5705dc19192042",
+        url="https://pypi.org/packages/51/4d/e0728a800636654fb9edc1ffde6ff505eec56bf87fdc3a861d8060b64193/arrow-0.14.1-py2.py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:", type=("build", "run"), when="@1.2.1:")
-    depends_on("python@2.7:2.8,3.5:", type=("build", "run"), when="@:0.16.0")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-python-dateutil", type=("build", "run"))
-    depends_on("py-typing-extensions", type=("build", "run"), when="@1.2.1: ^python@:3.7")
-    depends_on("py-python-dateutil@2.7.0:", type=("build", "run"), when="@1.2.1:")
+    with default_args(type="run"):
+        depends_on("py-python-dateutil@2.7:", when="@0.16:")
+        depends_on("py-python-dateutil", when="@0.14.3:0.15")
+        depends_on("py-typing-extensions", when="@1:1.2 ^python@:3.7")

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

@@ -14,7 +14,8 @@ class PyArt(PythonPackage):
 
     license("MIT")
 
-    version("6.1", sha256="6ab3031e3b7710039e73497b0e750cadfe04d4c1279ce3a123500dbafb9e1b64")
-
-    depends_on("python@3.5:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    version(
+        "6.1",
+        sha256="159819c418001467f8d79616fa0814277deac97c8a363d1eb3e7c0a31526bfc3",
+        url="https://pypi.org/packages/fc/53/d8792ac2ebb494db0e0ba3ad3f0a9ee71144a5ced266441166f7d038a37e/art-6.1-py3-none-any.whl",
+    )

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

@@ -16,13 +16,17 @@ class PyArviz(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.6.1", sha256="435edf8db49c41a8fa198f959e7581063006c49a4efdef4755bb778db6fd4f72")
+    version(
+        "0.6.1",
+        sha256="fa613e6f796501f352462c747638d7e1d7ae3e3ed36e665e547def1b2524602c",
+        url="https://pypi.org/packages/ec/8b/83472d660e004a69b8e7b3c1dd12a607167774097138445d0dda1a3590dc/arviz-0.6.1-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-matplotlib@3.0:", type=("build", "run"))
-    depends_on("py-numpy@1.12:", type=("build", "run"))
-    depends_on("py-scipy@0.19:", type=("build", "run"))
-    depends_on("py-packaging", type=("build", "run"))
-    depends_on("py-pandas@0.23:", type=("build", "run"))
-    depends_on("py-xarray@0.11:", type=("build", "run"))
-    depends_on("py-netcdf4", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-matplotlib@3.0.0:", when="@:0.12")
+        depends_on("py-netcdf4", when="@:0.14")
+        depends_on("py-numpy@1.12.0:", when="@0.5:0.12")
+        depends_on("py-packaging", when="@0.6:")
+        depends_on("py-pandas@0.23.0:", when="@0.5:0.12")
+        depends_on("py-scipy@0.19:", when="@0.5:0.12")
+        depends_on("py-xarray@0.11:", when="@0.5:0.9")

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

@@ -16,11 +16,12 @@ class PyAsdfStandard(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("1.0.3", sha256="afd8ff9a70e7b17f6bcc64eb92a544867d5d4fe1f0076719142fdf62b96cfd44")
+    version(
+        "1.0.3",
+        sha256="1c628379c75f0663b6376a7e681d31b1b54391053e53447c9921fb04c26d41da",
+        url="https://pypi.org/packages/b1/3e/2873079563324cbc60a152be07a38c8595bcfe0cadda4db8a1a1c9b5b2a7/asdf_standard-1.0.3-py3-none-any.whl",
+    )
 
-    depends_on("python@3.8:", type=("build", "run"))
-
-    depends_on("py-setuptools@42:", type="build")
-    depends_on("py-setuptools-scm@3.4: +toml", type="build")
-
-    depends_on("py-importlib-resources@3:", type=("build", "run"), when="^python@:3.8")
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@1.0.2:1.0")
+        depends_on("py-importlib-resources@3:", when="@1.0.1:1.0 ^python@:3.8")

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

@@ -16,12 +16,13 @@ class PyAsdfTransformSchemas(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.3.0", sha256="0cf2ff7b22ccb408fe58ddd9b2441a59ba73fe323e416d59b9e0a4728a7d2dd6")
+    version(
+        "0.3.0",
+        sha256="b0dbcae1bd15afea52d67209d8a75533c0ad3713e7e0eb55d968ff70393cc7fc",
+        url="https://pypi.org/packages/2a/f2/b184f660552be16a3bd00b5c70eeb3abff9d154ccfbb1c868482a9559de0/asdf_transform_schemas-0.3.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.8:", type=("build", "run"))
-
-    depends_on("py-setuptools@42:", type="build")
-    depends_on("py-setuptools-scm@3.4: +toml", type="build")
-
-    depends_on("py-asdf-standard@1.0.1:", type=("build", "run"))
-    depends_on("py-importlib-resources@3:", type=("build", "run"), when="^python@:3.8")
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@0.3:0.4")
+        depends_on("py-asdf-standard@1.0.1:", when="@0.2.1:0.4")
+        depends_on("py-importlib-resources@3:", when="@0.2.1:0.4 ^python@:3.8")

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

@@ -16,12 +16,13 @@ class PyAsdfUnitSchemas(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.1.0", sha256="42b78d67213efe4ffd4529fb0e58d9c7a0dab5cbf8839b230f1bc0a446bff999")
+    version(
+        "0.1.0",
+        sha256="0e104b53c23a9e15541cfa5d101613d2724a9124fc56301324512659afb470d5",
+        url="https://pypi.org/packages/3e/55/78e900affcb8306cb669e52ee2eac670badef4c8d5938e8dae824ef21932/asdf_unit_schemas-0.1.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.8:", type=("build", "run"))
-
-    depends_on("py-setuptools@42:", type="build")
-    depends_on("py-setuptools-scm@3.4: +toml", type="build")
-
-    depends_on("py-asdf-standard@1.0.1:", type=("build", "run"))
-    depends_on("py-importlib-resources@3:", type=("build", "run"), when="^python@:3.8")
+    with default_args(type="run"):
+        depends_on("python@3.8:")
+        depends_on("py-asdf-standard@1.0.1:", when="@:0.1")
+        depends_on("py-importlib-resources@3:", when="@:0.1 ^python@:3.8")

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

@@ -14,20 +14,67 @@ class PyAsgiref(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("3.5.2", sha256="62f04f81110898e471a7d5b37f88c923c2864d43fa6abb66a95980becb1a2ba4")
-    version("3.5.0", sha256="2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0")
-    version("3.2.7", sha256="8a0b556b9e936418475f6670d59e14592c41d15d00b5ea4ad26f2b46f9f4fb9a")
-    version("3.2.6", sha256="29788163bdad8d494475a0137eba39b111fd86fbe825534a9376f9f2ab44251a")
-    version("3.2.5", sha256="eeb01ba02e86859746ee2a7bc8a75c484a006dc9575723563f24642a12b2bba8")
-    version("3.2.4", sha256="89e47532340338b7eafd717ab28658e8b48f4565d8384628c88d2d41565c8da0")
-    version("3.2.3", sha256="d38e16141c7189e23bfe03342d9cd3dbfd6baab99217892bfa7bc5646315b6bd")
-    version("3.2.2", sha256="47edf327aa70f317c9bc810d469ce681f1b35a7f499f68cf2b5da3ba6a651e69")
-    version("3.2.1", sha256="06a21df1f4456d29079f3c475c09ac31167bcc5f024c637dedf4e00d2dd9020b")
-    version("3.2.0", sha256="5db8c7a6c1ff54ea04a52f994d8af959427f1cab8e427aa802492a89fb0b635a")
-    version("3.1.4", sha256="bf01c52111ef7af2adc1e6d90282d2a32c5ebe09e84ae448389ceff7cef53fa9")
-    version("3.1.3", sha256="5b8bb7b3719b8c12a6c2363784a4d8c0eb5e980d8b4fdb6f38eccb52071dfab5")
+    version(
+        "3.5.2",
+        sha256="1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4",
+        url="https://pypi.org/packages/af/6d/ea3a5c3027c3f14b0321cd4f7e594c776ebe64e4b927432ca6917512a4f7/asgiref-3.5.2-py3-none-any.whl",
+    )
+    version(
+        "3.5.0",
+        sha256="88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9",
+        url="https://pypi.org/packages/0b/9f/5f3b91391578312827561b669a0397d58535b4e82966c8f1667525c7d563/asgiref-3.5.0-py3-none-any.whl",
+    )
+    version(
+        "3.2.7",
+        sha256="9ca8b952a0a9afa61d30aa6d3d9b570bb3fd6bafcf7ec9e6bed43b936133db1c",
+        url="https://pypi.org/packages/68/00/25013f7310a56d17e1ab6fd885d5c1f216b7123b550d295c93f8e29d372a/asgiref-3.2.7-py2.py3-none-any.whl",
+    )
+    version(
+        "3.2.6",
+        sha256="9c65b42045910c159ad41fc33692a8a6e6e154d8d05244ea69a0cbc617edad31",
+        url="https://pypi.org/packages/e2/ea/37fac52810bfa225c867cd05766d80c12799f0a0d38a552dfe0ba7d02a90/asgiref-3.2.6-py2.py3-none-any.whl",
+    )
+    version(
+        "3.2.5",
+        sha256="3e4192eaec0758b99722f0b0666d5fbfaa713054d92e8de5b58ba84ec5ce696f",
+        url="https://pypi.org/packages/bc/a9/90e110710d44289d807b5604bcd18419ece1a6f88e9a2489d3de4718a20b/asgiref-3.2.5-py2.py3-none-any.whl",
+    )
+    version(
+        "3.2.4",
+        sha256="5e60ea919b37e5b9d8896d802c0dbbe41b16ea6719e5695a43496ef43e5b19ac",
+        url="https://pypi.org/packages/80/c6/03bd9a8568952c275e8b2ee4ab3ac744d5fff7a8d2b5bba5b93715ba742e/asgiref-3.2.4-py2.py3-none-any.whl",
+    )
+    version(
+        "3.2.3",
+        sha256="ea448f92fc35a0ef4b1508f53a04c4670255a3f33d22a81c8fc9c872036adbe5",
+        url="https://pypi.org/packages/a5/cb/5a235b605a9753ebcb2730c75e610fb51c8cab3f01230080a8229fa36adb/asgiref-3.2.3-py2.py3-none-any.whl",
+    )
+    version(
+        "3.2.2",
+        sha256="a4ce726e6ef49cca13642ff49588530ebabcc47c669c7a95af37ea5a74b9b823",
+        url="https://pypi.org/packages/d0/39/42344b1060cfb5542eecef3ce6dda3d2d5a89a660716ed5980635985f2a7/asgiref-3.2.2-py2.py3-none-any.whl",
+    )
+    version(
+        "3.2.1",
+        sha256="ceac3968866501249712f482ae807605246cfae8293a70de29417868ddef673c",
+        url="https://pypi.org/packages/4c/b9/9eb9762c9b43754d49e6b85625c1a5a45673a3083c742be00d8721839b01/asgiref-3.2.1-py2.py3-none-any.whl",
+    )
+    version(
+        "3.2.0",
+        sha256="abfe78df4bdefdbdc6902b1900c14e60b4cd7fea2ce218b5f12d998a46a9eb18",
+        url="https://pypi.org/packages/fb/58/27f90221f17bbda171d345f06009749004b60aea53a723443903bd99673d/asgiref-3.2.0-py2.py3-none-any.whl",
+    )
+    version(
+        "3.1.4",
+        sha256="b718a9d35e204a96e2456c2271b0ef12e36124c363b3a8fd1d626744f23192aa",
+        url="https://pypi.org/packages/ce/2e/dd4b5afc37d595fc44def4f365cc8ee080a4962a0eb1e05e79da65a8e074/asgiref-3.1.4-py2.py3-none-any.whl",
+    )
+    version(
+        "3.1.3",
+        sha256="34227987327d13bc4b19d338faa6fed8a25cea79cca2e9e50490d212f56470f8",
+        url="https://pypi.org/packages/c2/c4/db607d2dcdd1d88763528de1066dec9f36cca470c1d101de5cc35c90b0b9/asgiref-3.1.3-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("python@3.5:", type=("build", "run"))
-    depends_on("python@3.7:", type=("build", "run"), when="@3.5.0:")
-    depends_on("py-typing-extensions", type=("build", "run"), when="@3.5: ^python@:3.7")
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@3.5:3.7")
+        depends_on("py-typing-extensions", when="@3.3.2:3.6 ^python@:3.7")

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

@@ -15,9 +15,23 @@ class PyAsn1crypto(PythonPackage):
 
     license("MIT")
 
-    version("1.5.1", sha256="13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c")
-    version("1.4.0", sha256="f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c")
-    version("0.24.0", sha256="9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49")
-    version("0.22.0", sha256="cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "1.5.1",
+        sha256="db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67",
+        url="https://pypi.org/packages/c9/7f/09065fd9e27da0eda08b4d6897f1c13535066174cc023af248fc2a8d5e5a/asn1crypto-1.5.1-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.0",
+        sha256="4bcdf33c861c7d40bdcd74d8e4dd7661aac320fcdf40b9a3f95b4ee12fde2fa8",
+        url="https://pypi.org/packages/b5/a8/56be92dcd4a5bf1998705a9b4028249fe7c9a035b955fe93b6a3e5b829f8/asn1crypto-1.4.0-py2.py3-none-any.whl",
+    )
+    version(
+        "0.24.0",
+        sha256="2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87",
+        url="https://pypi.org/packages/ea/cd/35485615f45f30a510576f1a56d1e0a7ad7bd8ab5ed7cdc600ef7cd06222/asn1crypto-0.24.0-py2.py3-none-any.whl",
+    )
+    version(
+        "0.22.0",
+        sha256="d232509fefcfcdb9a331f37e9c9dc20441019ad927c7d2176cf18ed5da0ba097",
+        url="https://pypi.org/packages/97/ba/7e8117d8efcee589f4d96dd2b2eb1d997f96d27d214cf2b7134ad8acf6ab/asn1crypto-0.22.0-py2.py3-none-any.whl",
+    )

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

@@ -14,8 +14,11 @@ class PyAspyYaml(PythonPackage):
 
     license("MIT")
 
-    version("1.3.0", sha256="e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45")
+    version(
+        "1.3.0",
+        sha256="463372c043f70160a9ec950c3f1e4c3a82db5fca01d334b6bc89c7164d744bdc",
+        url="https://pypi.org/packages/99/ce/78be097b00817ccf02deaf481eb7a603eecee6fa216e82fa7848cd265449/aspy.yaml-1.3.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-pyyaml", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-pyyaml", when="@0.2.2:")

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

@@ -14,10 +14,23 @@ class PyAsserts(PythonPackage):
 
     license("MIT")
 
-    version("0.10.0", sha256="3466cf32c36d97ee2802121438003693546f590be81095317d0d698066bb5df7")
-    version("0.9.1", sha256="a73ea6b2ddc77364a5f0e13197f00662485944a6dd31c1f7555ff2f99c0f7319")
-    version("0.9.0", sha256="e3b8b06309234f9a7c6e4679e0f3cc127cf18da95c30fbb524ff47d439e22b17")
-    version("0.8.6", sha256="8a477746dbc501ac0d1fe9e593a1faafa7d361ceca79d994d3b2ebeecc7fbf32")
-
-    depends_on("python@2.7:2.8,3.5:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.10.0",
+        sha256="d42de39290badeb1816f09bec2996912718e9b3a379a3415e6731bb0d2b271b2",
+        url="https://pypi.org/packages/e2/07/cbb15d287cd9424b55da504124aea3cf59fec6de870dad1f75b7c0f717aa/asserts-0.10.0-py2.py3-none-any.whl",
+    )
+    version(
+        "0.9.1",
+        sha256="a33eed1fbddc053a929011025d6e8589c9e1ba0e13de6ae26d1f76c4f807f8d4",
+        url="https://pypi.org/packages/00/bf/6b059c76d427ee802c9372467e344245aaedfef1024333dee76c8748c486/asserts-0.9.1-py2.py3-none-any.whl",
+    )
+    version(
+        "0.9.0",
+        sha256="aa0685b6652b15f6b42c2be260e0f315eb6a42cf5f08e4b37ab90fb6d429bfb9",
+        url="https://pypi.org/packages/6d/bd/9357ffd43a07dffe5bb980eb776ae4276ac5c02ae5c77ceae3dc369d3b09/asserts-0.9.0-py2.py3-none-any.whl",
+    )
+    version(
+        "0.8.6",
+        sha256="609078daa69b619a733e812acd4d6d1d559028bed711c8712942fe718d50db57",
+        url="https://pypi.org/packages/90/be/d2b1249330b07afcbbfdbe5387d44e8bdeb728fba80e6e0f2bae2c4c657d/asserts-0.8.6-py2.py3-none-any.whl",
+    )

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

@@ -14,18 +14,22 @@ class PyAstor(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.8.1", sha256="6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e")
-    version("0.8.0", sha256="37a6eed8b371f1228db08234ed7f6cfdc7817a3ed3824797e20cbb11dc2a7862")
-    version("0.6", sha256="175ec395cde36aa0178c5a3120d03954c65d1ef4bb19ec4aa30e9d7a7cc426c4")
-
-    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.8.1",
+        sha256="070a54e890cefb5b3739d19f30f5a5ec840ffc9c50ffa7d23cc9fc1a38ebbfc5",
+        url="https://pypi.org/packages/c3/88/97eef84f48fa04fbd6750e62dcceafba6c63c81b7ac1420856c8dcc0a3f9/astor-0.8.1-py2.py3-none-any.whl",
+    )
+    version(
+        "0.8.0",
+        sha256="0e41295809baf43ae8303350e031aff81ae52189b6f881f36d623fa8b2f1960e",
+        url="https://pypi.org/packages/d1/4f/950dfae467b384fc96bc6469de25d832534f6b4441033c39f914efd13418/astor-0.8.0-py2.py3-none-any.whl",
+    )
+    version(
+        "0.6",
+        sha256="5b5d375c4e3d2d0f52fcfe0128bc064d928f36fe622b52e4127a631803fbe2ab",
+        url="https://pypi.org/packages/69/32/e8a3285c0be9ce7ef42bfa302b995109036994713344b6baeed88bb12146/astor-0.6-py2.py3-none-any.whl",
+    )
 
     # Build fails with newer versions of setuptools
     # https://github.com/berkerpeksag/astor/issues/162
     # https://github.com/berkerpeksag/astor/pull/163
-    patch(
-        "https://github.com/berkerpeksag/astor/pull/163/commits/30059dac4eb832e58ab2109db84508b294ba366d.patch?full_index=1",
-        sha256="edc5eeddabe153b08e938f52edaeb2d880ee3128082967f310db0f98510fe6e0",
-        when="@0.8.0",
-    )

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

@@ -14,10 +14,13 @@ class PyAstpretty(PythonPackage):
 
     license("MIT")
 
-    version("2.0.0", sha256="e4724bfd753636ba4a84384702e9796e5356969f40af2596d846ce64addde086")
+    version(
+        "2.0.0",
+        sha256="7f27633ed885033da8b58666e7079ffff7e8e01869ec1aa66484cb5185ea3aa4",
+        url="https://pypi.org/packages/34/8e/93b94d3c6dc00446ddf33d0e82490fcc52b094a0fd59bf5433158da330e5/astpretty-2.0.0-py2.py3-none-any.whl",
+    )
 
     variant("typed", default=False, description="Add support for typed comments")
 
-    depends_on("python@3.6.1:", type=("build", "run"))
-    depends_on("py-setuptools", type=("build", "run"))
-    depends_on("py-typed-ast", type=("build", "run"), when="+typed")
+    with default_args(type="run"):
+        depends_on("py-typed-ast", when="@1.4:2+typed")

var/spack/repos/builtin/packages/py-astroid/PR546.patch

@@ -1,129 +0,0 @@
-From beb8c1add0facf57d70d986812ffb45336b6b261 Mon Sep 17 00:00:00 2001
-From: Mario Corchero <mcorcherojim@bloomberg.net>
-Date: Mon, 14 May 2018 11:20:45 -0400
-Subject: [PATCH 1/2] Fix import of symlinks outside of path
-
-Makes load_module_from_file able to import files within the path that
-are just a symlink to a file outside of the path.
-modutils is using realpath at the moment which will resolve the symlink
-and don't allow the import as the file is detected outside of the
-available paths. By checking both abspath and realpath this patches add
-support for such scenarios.
----
- astroid/modutils.py                | 64 ++++++++++++++++++++++++------
- astroid/tests/unittest_modutils.py | 11 +++++
- 2 files changed, 63 insertions(+), 12 deletions(-)
-
-diff --git a/astroid/modutils.py b/astroid/modutils.py
-index 83d0ba74..78a55575 100644
---- a/astroid/modutils.py
-+++ b/astroid/modutils.py
-@@ -285,26 +285,66 @@ def check_modpath_has_init(path, mod_path):
-     return True
- 
- 
-+def _get_relative_base_path(filename, path_to_check):
-+    """Extracts the relative mod path of the file to import from
-+
-+    Check if a file is within the passed in path and if so, returns the
-+    relative mod path from the one passed in.
-+
-+    If the filename is no in path_to_check, returns None
-+
-+    Note this function will look for both abs and realpath of the file,
-+    this allows to find the relative base path even if the file is a
-+    symlink of a file in the passed in path
-+
-+    Examples:
-+        _get_relative_base_path("/a/b/c/d.py", "/a/b") ->  ["c","d"]
-+        _get_relative_base_path("/a/b/c/d.py", "/dev") ->  None
-+
-+        Given "/myfile.py" is a symlink of "/a/b/c/d.py":
-+        _get_relative_base_path("/myfile.py", "/dev") ->  ["c","d"]
-+    """
-+    importable_path = None
-+    path_to_check = os.path.normcase(path_to_check)
-+    abs_filename = os.path.abspath(filename)
-+    if os.path.normcase(abs_filename).startswith(path_to_check):
-+        importable_path = abs_filename
-+
-+    real_filename = os.path.realpath(filename)
-+    if os.path.normcase(real_filename).startswith(path_to_check):
-+        importable_path = real_filename
-+
-+    if importable_path:
-+        base_path = os.path.splitext(importable_path)[0]
-+        relative_base_path = base_path[len(path_to_check):]
-+        return [pkg for pkg in relative_base_path.split(os.sep) if pkg]
-+
-+    return None
-+
-+
- def modpath_from_file_with_callback(filename, extrapath=None, is_package_cb=None):
--    filename = _path_from_filename(filename)
--    filename = os.path.realpath(os.path.expanduser(filename))
--    base = os.path.splitext(filename)[0]
-+    filename = os.path.expanduser(_path_from_filename(filename))
- 
-     if extrapath is not None:
-         for path_ in six.moves.map(_canonicalize_path, extrapath):
-             path = os.path.abspath(path_)
--            if path and os.path.normcase(base[:len(path)]) == os.path.normcase(path):
--                submodpath = [pkg for pkg in base[len(path):].split(os.sep)
--                              if pkg]
--                if is_package_cb(path, submodpath[:-1]):
--                    return extrapath[path_].split('.') + submodpath
-+            if not path:
-+                continue
-+            submodpath = _get_relative_base_path(filename, path)
-+            if not submodpath:
-+                continue
-+            if is_package_cb(path, submodpath[:-1]):
-+                return extrapath[path_].split('.') + submodpath
- 
-     for path in six.moves.map(_canonicalize_path, sys.path):
-         path = _cache_normalize_path(path)
--        if path and os.path.normcase(base).startswith(path):
--            modpath = [pkg for pkg in base[len(path):].split(os.sep) if pkg]
--            if is_package_cb(path, modpath[:-1]):
--                return modpath
-+        if not path:
-+            continue
-+        modpath = _get_relative_base_path(filename, path)
-+        if not modpath:
-+            continue
-+        if is_package_cb(path, modpath[:-1]):
-+            return modpath
- 
-     raise ImportError('Unable to find module for %s in %s' % (
-         filename, ', \n'.join(sys.path)))
-diff --git a/astroid/tests/unittest_modutils.py b/astroid/tests/unittest_modutils.py
-index ef3c460c..76c04eb1 100644
---- a/astroid/tests/unittest_modutils.py
-+++ b/astroid/tests/unittest_modutils.py
-@@ -15,6 +15,7 @@
- import sys
- import unittest
- from xml import etree
-+import tempfile
- 
- import astroid
- from astroid.interpreter._import import spec
-@@ -110,6 +111,16 @@ def test_knownValues_modpath_from_file_2(self):
-     def test_raise_modpath_from_file_Exception(self):
-         self.assertRaises(Exception, modutils.modpath_from_file, '/turlututu')
- 
-+    def test_import_symlink_with_source_outside_of_path(self):
-+        with tempfile.NamedTemporaryFile() as tmpfile:
-+            linked_file_name = 'symlinked_file.py'
-+            try:
-+                os.symlink(tmpfile.name, linked_file_name)
-+                self.assertEqual(modutils.modpath_from_file(linked_file_name),
-+                                 ['symlinked_file'])
-+            finally:
-+                os.remove(linked_file_name)
-+
- 
- class LoadModuleFromPathTest(resources.SysPathSetup, unittest.TestCase):
- 
-

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

@@ -15,57 +15,110 @@ class PyAstroid(PythonPackage):
 
     license("LGPL-2.1-or-later")
 
-    version("2.14.2", sha256="a3cf9f02c53dd259144a7e8f3ccd75d67c9a8c716ef183e0c1f291bc5d7bb3cf")
-    version("2.12.10", sha256="81f870105d892e73bf535da77a8261aa5bde838fa4ed12bb2f435291a098c581")
-    version("2.12.7", sha256="cd468be9d9d03d086d4d7e6643a59bfc025762d2c895e1e22cf21feced7bb148")
-    version("2.11.6", sha256="4f933d0bf5e408b03a6feb5d23793740c27e07340605f236496cd6ce552043d6")
-    version("2.11.5", sha256="f4e4ec5294c4b07ac38bab9ca5ddd3914d4bf46f9006eb5c0ae755755061044e")
-    version("2.11.4", sha256="561dc6015eecce7e696ff7e3b40434bc56831afeff783f0ea853e19c4f635c06")
-    version("2.8.3", sha256="0e361da0744d5011d4f5d57e64473ba9b7ab4da1e2d45d6631ebd67dd28c3cce")
-    version("2.7.3", sha256="3b680ce0419b8a771aba6190139a3998d14b413852506d99aff8dc2bf65ee67c")
-    version("2.5.6", sha256="8a398dfce302c13f14bab13e2b14fe385d32b73f4e4853b9bdfb64598baa1975")
-    version("2.4.2", sha256="2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703")
-    version("2.3.3", sha256="71ea07f44df9568a75d0f354c49143a4575d90645e9fead6dfb52c26a85ed13a")
-    version("2.2.5", sha256="6560e1e1749f68c64a4b5dee4e091fce798d2f0d84ebe638cf0e0585a343acf4")
-    version("2.2.0", sha256="1d5d0e6e408701ae657342645465d08be6fb66cf0ede16a31cc6435bd2e61718")
-    version("2.0.4", sha256="c7013d119ec95eb626f7a2011f0b63d0c9a095df9ad06d8507b37084eada1a8d")
-    version("1.6.6", sha256="d25869fc7f44f1d9fb7d24fd7ea0639656f5355fc3089cd1f3d18c6ec6b124c7")
-    version("1.4.5", sha256="729b986aa59fb77af533707c385021b04e60d136b5f21cc766618556d0816cf6")
-    version("1.4.4", sha256="7f7e5512efe515098e77cbd3a60e87c8db8954097b0e025d8d6f72f2e8ddc298")
-    version("1.4.3", sha256="8e9ce4e925a17442cec085a7fce05478b99e482c13819c619b7cdd793777bf6b")
-    version("1.4.2", sha256="b734fa504179a93aa03314df48b45fb1d9d0d8770a1126e7a126c9ac4aebd5c3")
-    version("1.4.1", sha256="2417a2c62f07bb77485efb6dd94567ac165808a4248ecb09754116662ffa9fc2")
+    version(
+        "2.14.2",
+        sha256="0e0e3709d64fbffd3037e4ff403580550f14471fd3eaae9fa11cc9a5c7901153",
+        url="https://pypi.org/packages/ae/40/d6fbafb01a3da14289c7cc8ff82a0513ccd82a49219ffa84c67a46b1b712/astroid-2.14.2-py3-none-any.whl",
+    )
+    version(
+        "2.12.10",
+        sha256="997e0c735df60d4a4caff27080a3afc51f9bdd693d3572a4a0b7090b645c36c5",
+        url="https://pypi.org/packages/68/48/7f3de2f4f94f0b18afe5bc1b587a23b4f9a173909db4eff9cc7d92b8d3cc/astroid-2.12.10-py3-none-any.whl",
+    )
+    version(
+        "2.12.7",
+        sha256="9b408d5d540387a74ca5405a5197aa24fbf9178b4019b16b3e532fbdf0e467cc",
+        url="https://pypi.org/packages/bd/9a/6ed1fe23ae26fe6f0a8064f96ab7b41c517885076253a43464acfe6f497e/astroid-2.12.7-py3-none-any.whl",
+    )
+    version(
+        "2.11.6",
+        sha256="ba33a82a9a9c06a5ceed98180c5aab16e29c285b828d94696bf32d6015ea82a9",
+        url="https://pypi.org/packages/b6/38/1b2188bea6b5346ea2f97f063c99fdadb36707a7b3a95ff4fe73e242c33c/astroid-2.11.6-py3-none-any.whl",
+    )
+    version(
+        "2.11.5",
+        sha256="14ffbb4f6aa2cf474a0834014005487f7ecd8924996083ab411e7fa0b508ce0b",
+        url="https://pypi.org/packages/94/58/6f1bbfd88b6ba5271b4a9be99cb15cb2fe369794ba410390f0d672c6ad39/astroid-2.11.5-py3-none-any.whl",
+    )
+    version(
+        "2.11.4",
+        sha256="da0632b7c046d8361dfe1b1abb2e085a38624961fabe2997565a9c06c1be9d9a",
+        url="https://pypi.org/packages/24/f1/d3b7d72cae86abb75a28b2ae7be0668452753507e8156c9955b244fbc795/astroid-2.11.4-py3-none-any.whl",
+    )
+    version(
+        "2.8.3",
+        sha256="f9d66e3a4a0e5b52819b2ff41ac2b179df9d180697db71c92beb33a60c661794",
+        url="https://pypi.org/packages/c1/a5/be9c96e816a9159ef2e54ef030158360e8539da2bd9ce8a82208d2a0a640/astroid-2.8.3-py3-none-any.whl",
+    )
+    version(
+        "2.7.3",
+        sha256="dc1e8b28427d6bbef6b8842b18765ab58f558c42bb80540bd7648c98412af25e",
+        url="https://pypi.org/packages/2f/2b/46d2b492831ea7a637b88bef8e66aae0968edf57042d1f52073a531558ea/astroid-2.7.3-py3-none-any.whl",
+    )
+    version(
+        "2.5.6",
+        sha256="4db03ab5fc3340cf619dbc25e42c2cc3755154ce6009469766d7143d1fc2ee4e",
+        url="https://pypi.org/packages/f8/82/a61df6c2d68f3ae3ad1afa0d2e5ba5cfb7386eb80cffb453def7c5757271/astroid-2.5.6-py3-none-any.whl",
+    )
+    version(
+        "2.4.2",
+        sha256="bc58d83eb610252fd8de6363e39d4f1d0619c894b0ed24603b881c02e64c7386",
+        url="https://pypi.org/packages/24/a8/5133f51967fb21e46ee50831c3f5dda49e976b7f915408d670b1603d41d6/astroid-2.4.2-py3-none-any.whl",
+    )
+    version(
+        "1.6.6",
+        sha256="87de48a92e29cedf7210ffa853d11441e7ad94cb47bacd91b023499b51cbc756",
+        url="https://pypi.org/packages/8b/29/0f7ec6fbf28a158886b7de49aee3a77a8a47a7e24c60e9fd6ec98ee2ec02/astroid-1.6.6-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.5",
+        sha256="46cd033dddbc3dc602d64991949d43232cf08d53cd4c06cae224895d542d9358",
+        url="https://pypi.org/packages/da/6b/bce6c46354d8bb59ad842f737084c176c636b7f94caf7aa5974d1c41ebbf/astroid-1.4.5-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.4",
+        sha256="5e09d952001bce3ad0f700f982f58658b5f2d1ae3761e60d7d2645fa7b19c0fc",
+        url="https://pypi.org/packages/1e/d7/9622bc4593fc86738f47b78c87cf70388ed84cae3305306b17d08ff367d2/astroid-1.4.4-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.3",
+        sha256="c4ce2041da305960ee290e0d45482668dcbe7fb5047030636a0996b344ac978a",
+        url="https://pypi.org/packages/4e/e4/692b43ca0228da68179925ef43fa531cdf67c78334bdb5790ed2718141f3/astroid-1.4.3-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.2",
+        sha256="34d3ca4e7369e15c5b9f76a441ede106c351d6d0f256cd6eb286b2bebeec0db3",
+        url="https://pypi.org/packages/c9/a2/df818426ce8c437363c35fcb8d0b6570c765181793797cfd9d483fe99bdf/astroid-1.4.2-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.1",
+        sha256="3e369a37695390d1c5a4c292b84f3ce7673f5ac93a92f328522c42cb26fd20ef",
+        url="https://pypi.org/packages/3a/5b/66057c670184eec8adffa2d9eda78ee4bbcf9c043acbd839c5f609365e89/astroid-1.4.1-py2.py3-none-any.whl",
+    )
+
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@2.12:2")
+        depends_on("python@:3", when="@2.5.4:2.9.0")
+        depends_on("py-lazy-object-proxy@1.4:", when="@2.5:2")
+        depends_on("py-lazy-object-proxy@1.4", when="@2:2.4")
+        depends_on("py-lazy-object-proxy", when="@1.6:1")
+        depends_on("py-setuptools@20:", when="@2.6.3:2.11")
+        depends_on("py-six@1.12:", when="@2:2.4")
+        depends_on("py-six", when="@1.6:1")
+        depends_on("py-typed-ast@1.4:", when="@2.8.5:2 ^python@:3.7")
+        depends_on("py-typed-ast@1.4", when="@2:2.8.4 ^python@:3.7")
+        depends_on("py-typing-extensions@4:", when="@2.13.3: ^python@:3.10")
+        depends_on("py-typing-extensions@3.10:", when="@2.8:2.13.0 ^python@:3.9")
+        depends_on("py-typing-extensions@3.7.4:", when="@2.5.7:2.7 ^python@:3.7")
+        depends_on("py-wrapt@1.14.0:", when="@2.12.3:2 ^python@3.11:")
+        depends_on("py-wrapt@1.11:", when="@2.12.3:2 ^python@:3.10")
+        depends_on("py-wrapt@1.11:1.13", when="@2.8.3:2.10")
+        depends_on("py-wrapt@1.11:1.12", when="@2.5:2.8.2")
+        depends_on("py-wrapt@1.11:", when="@2:2.4,2.11:2.12.2")
+        depends_on("py-wrapt", when="@1.6:1")
 
     # fixes symlink resolution, already included in 2: but not in 1.6.6
-    patch("PR546.patch", when="@1.6.6")
 
     # Dependencies taken from astroid/__pkginfo__.py
-    depends_on("python@2.7:2.8,3.4:", when="@:1", type=("build", "run"))
-    depends_on("python@3.4:", when="@2.0.0:", type=("build", "run"))
-    depends_on("python@3.5:", when="@2.3.3:", type=("build", "run"))
-    depends_on("python@3.6:", when="@2.5.6:", type=("build", "run"))
-    depends_on("python@3.6.2:", when="@2.11.4:", type=("build", "run"))
-    depends_on("python@3.7.2:", when="@2.12.7:", type=("build", "run"))
-    depends_on("py-lazy-object-proxy", type=("build", "run"))
     # Starting with astroid 2.3.1, astroid's dependencies were restricted
     # to a given minor version, c.f. commit e1b4e11.
-    depends_on("py-lazy-object-proxy@1.4.0:1.4", when="@2.3.1:2.7.2", type=("build", "run"))
-    depends_on("py-lazy-object-proxy@1.4.0:", when="@2.7.3:", type=("build", "run"))
-    depends_on("py-six", when="@:2.7.2", type=("build", "run"))
-    depends_on("py-six@1.12:1", when="@2.3.3:2.7.2", type=("build", "run"))
-    depends_on("py-wrapt", when="@:2.2", type=("build", "run"))
-    depends_on("py-wrapt@1.11:1.12", when="@2.3.3:2.8.2", type=("build", "run"))
-    depends_on("py-wrapt@1.11:1.13", when="@2.8.3:2.10", type=("build", "run"))
-    depends_on("py-wrapt@1.11:1", when="@2.11", type=("build", "run"))
-    depends_on("py-wrapt@1.14:1", when="@2.12.7: ^python@3.11:", type=("build", "run"))
-    depends_on("py-wrapt@1.11:1", when="@2.12.7: ^python@:3.10", type=("build", "run"))
-    depends_on("py-typed-ast@1.3.0:", when="@2.2.5:2.3.0 ^python@3.7.0:3.7")
-    depends_on("py-typed-ast@1.4.0:1.4", when="@2.3.1:2.8.4 ^python@:3.7", type=("build", "run"))
-    depends_on("py-typed-ast@1.4.0:1", when="@2.8.5: ^python@:3.7", type=("build", "run"))
-    depends_on("py-typing-extensions@3.7.4:", when="@2.7.3: ^python@:3.7", type=("build", "run"))
-    depends_on("py-typing-extensions@3.10:", when="@2.8.3: ^python@:3.9", type=("build", "run"))
-    depends_on("py-typing-extensions@4.0:", when="@2.14: ^python@:3.10", type=("build", "run"))
-    depends_on("py-setuptools@17.1:", type=("build", "run"))
-    depends_on("py-setuptools@20:", when="@2.7.3:", type=("build", "run"))
-    depends_on("py-setuptools@62.6:62", when="@2.12.7:", type=("build", "run"))
-    depends_on("py-wheel@0.37.1:0.37", when="@2.12.7:", type="build")

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

@@ -14,13 +14,27 @@ class PyAsttokens(PythonPackage):
 
     license("Apache-2.0")
 
-    version("2.4.0", sha256="2e0171b991b2c959acc6c49318049236844a5da1d65ba2672c4880c1c894834e")
-    version("2.2.1", sha256="4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3")
-    version("2.0.8", sha256="c61e16246ecfb2cde2958406b4c8ebc043c9e6d73aaa83c941673b35e5d3a76b")
-    version("2.0.5", sha256="9a54c114f02c7a9480d56550932546a3f1fe71d8a02f1bc7ccd0ee3ee35cf4d5")
+    version(
+        "2.4.0",
+        sha256="cf8fc9e61a86461aa9fb161a14a0841a03c405fa829ac6b202670b3495d2ce69",
+        url="https://pypi.org/packages/4f/25/adda9979586d9606300415c89ad0e4c5b53d72b92d2747a3c634701a6a02/asttokens-2.4.0-py2.py3-none-any.whl",
+    )
+    version(
+        "2.2.1",
+        sha256="6b0ac9e93fb0335014d382b8fa9b3afa7df546984258005da0b9e7095b3deb1c",
+        url="https://pypi.org/packages/f3/e1/64679d9d0759db5b182222c81ff322c2fe2c31e156a59afd6e9208c960e5/asttokens-2.2.1-py2.py3-none-any.whl",
+    )
+    version(
+        "2.0.8",
+        sha256="e3305297c744ae53ffa032c45dc347286165e4ffce6875dc662b205db0623d86",
+        url="https://pypi.org/packages/2d/1b/fdbdf82b86e07ca90985740ac160a1dd4ab09cb81071ec12d71c701e1138/asttokens-2.0.8-py2.py3-none-any.whl",
+    )
+    version(
+        "2.0.5",
+        sha256="0844691e88552595a6f4a4281a9f7f79b8dd45ca4ccea82e5e05b4bbdb76705c",
+        url="https://pypi.org/packages/16/d5/b0ad240c22bba2f4591693b0ca43aae94fbd77fb1e2b107d54fff1462b6f/asttokens-2.0.5-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools@44:", type="build")
-    depends_on("py-setuptools-scm+toml@3.4.3:", type="build")
-
-    depends_on("py-six@1.12:", when="@2.3:", type=("build", "run"))
-    depends_on("py-six", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-six@1.12:", when="@2.3:")
+        depends_on("py-six", when="@:2.2")

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

@@ -16,9 +16,17 @@ class PyAstunparse(PythonPackage):
 
     license("PSF-2.0")
 
-    version("1.6.3", sha256="5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872")
-    version("1.6.2", sha256="dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67")
+    version(
+        "1.6.3",
+        sha256="c2652417f2c8b5bb325c885ae329bdf3f86424075c4fd1a128674bc6fba4b8e8",
+        url="https://pypi.org/packages/2b/03/13dde6512ad7b4557eb792fbcf0c653af6076b81e5941d36ec61f7ce6028/astunparse-1.6.3-py2.py3-none-any.whl",
+    )
+    version(
+        "1.6.2",
+        sha256="271fb1f3d7a2e3c66eab41000298860f046253d22ec96e4f024cfaf266805a8e",
+        url="https://pypi.org/packages/2e/37/5dd0dd89b87bb5f0f32a7e775458412c52d78f230ab8d0c65df6aabc4479/astunparse-1.6.2-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-wheel@0.23.0:0", type=("build", "run"))
-    depends_on("py-six@1.6.1:1", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-six@1.6.1:", when="@1.5:")
+        depends_on("py-wheel@0.23:", when="@1.5:")

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

@@ -13,7 +13,8 @@ class PyAsyncGenerator(PythonPackage):
 
     license("Apache-2.0")
 
-    version("1.10", sha256="6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("python@3.5:")
+    version(
+        "1.10",
+        sha256="01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b",
+        url="https://pypi.org/packages/71/52/39d20e03abd0ac9159c162ec24b93fbcaa111e8400308f2465432495ca2b/async_generator-1.10-py3-none-any.whl",
+    )

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

@@ -15,13 +15,27 @@ class PyAsyncTimeout(PythonPackage):
 
     license("Apache-2.0")
 
-    version("4.0.2", sha256="2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15")
-    version("4.0.1", sha256="b930cb161a39042f9222f6efb7301399c87eeab394727ec5437924a36d6eef51")
-    version("4.0.0", sha256="7d87a4e8adba8ededb52e579ce6bc8276985888913620c935094c2276fd83382")
-    version("3.0.1", sha256="0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
+    version(
+        "4.0.2",
+        sha256="8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c",
+        url="https://pypi.org/packages/d6/c1/8991e7c5385b897b8c020cdaad718c5b087a6626d1d11a23e1ea87e325a7/async_timeout-4.0.2-py3-none-any.whl",
+    )
+    version(
+        "4.0.1",
+        sha256="a22c0b311af23337eb05fcf05a8b51c3ea53729d46fb5460af62bee033cec690",
+        url="https://pypi.org/packages/41/4a/2ca8802045b6df8dd25a0f8f7c216808e9e3bff2809efe4a36cc99d35cca/async_timeout-4.0.1-py3-none-any.whl",
+    )
+    version(
+        "4.0.0",
+        sha256="f3303dddf6cafa748a92747ab6c2ecf60e0aeca769aee4c151adfce243a05d9b",
+        url="https://pypi.org/packages/53/a9/cd484af830e5c525553da1a585ff4fe6f1d91a12f0131c736a3ef0d99cce/async_timeout-4.0.0-py3-none-any.whl",
+    )
+    version(
+        "3.0.1",
+        sha256="4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3",
+        url="https://pypi.org/packages/e1/1e/5a4441be21b0726c4464f3f23c8b19628372f606755a9d2e46c187e65ec4/async_timeout-3.0.1-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools@45:", type="build")
-    depends_on("python@3.5.3:", type=("build", "run"), when="@3.0.1:")
-    depends_on("python@3.6:", type=("build", "run"), when="@4.0.1:")
-    depends_on("py-typing-extensions@3.6.5:", type=("build", "run"), when="@4.0.1")
-    depends_on("py-typing-extensions@3.6.5:", type=("build", "run"), when="@4.0.2: ^python@:3.7")
+    with default_args(type="run"):
+        depends_on("py-typing-extensions@3.6.5:", when="@4.0.2: ^python@:3.7")
+        depends_on("py-typing-extensions@3.6.5:", when="@4.0.0-alpha2:4.0.1")

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

@@ -15,7 +15,8 @@ class PyAsynctest(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.13.0", sha256="c27862842d15d83e6a34eb0b2866c323880eb3a75e4485b079ea11748fd77fac")
-
-    depends_on("python@3.5:", type=("build", "run"))
-    depends_on("py-setuptools@30.3:", type="build")
+    version(
+        "0.13.0",
+        sha256="5da6118a7e6d6b54d83a8f7197769d046922a44d2a99c21382f0a6e4fadae676",
+        url="https://pypi.org/packages/e8/b6/8d17e169d577ca7678b11cd0d3ceebb0a6089a7f4a2de4b945fe4b1c86db/asynctest-0.13.0-py3-none-any.whl",
+    )

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

@@ -15,8 +15,11 @@ class PyAttmap(PythonPackage):
 
     license("BSD-2-Clause")
 
-    version("0.13.2", sha256="fdffa45f8671c13428eb8c3a1702bfdd1123badb99f7af14d72ad53cc7e770de")
+    version(
+        "0.13.2",
+        sha256="9c76af312c3678927a03ebb8fd2fa3a9cab37f7ce34f1dc574ea890c778f2f26",
+        url="https://pypi.org/packages/2b/14/20b368acd5aacbd0f01004f7ac8b57ced1a961833795c053fd87774ce7e8/attmap-0.13.2-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-
-    depends_on("py-ubiquerg@0.2.1:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-ubiquerg@0.2.1:", when="@0.13:")

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

@@ -15,26 +15,72 @@ class PyAttrs(PythonPackage):
 
     license("MIT")
 
-    version("23.1.0", sha256="6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015")
-    version("22.2.0", sha256="c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99")
-    version("22.1.0", sha256="29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6")
-    version("21.4.0", sha256="626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd")
-    version("21.2.0", sha256="ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb")
-    version("20.3.0", sha256="832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700")
-    version("20.2.0", sha256="26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594")
-    version("20.1.0", sha256="0ef97238856430dcf9228e07f316aefc17e8939fc8507e18c6501b761ef1a42a")
-    version("19.3.0", sha256="f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72")
-    version("19.2.0", sha256="f913492e1663d3c36f502e5e9ba6cd13cf19d7fab50aa13239e420fef95e1396")
-    version("19.1.0", sha256="f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399")
-    version("18.1.0", sha256="e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b")
-    version("16.3.0", sha256="80203177723e36f3bbe15aa8553da6e80d47bfe53647220ccaa9ad7a5e473ccc")
+    version(
+        "23.1.0",
+        sha256="1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04",
+        url="https://pypi.org/packages/f0/eb/fcb708c7bf5056045e9e98f62b93bd7467eb718b0202e7698eb11d66416c/attrs-23.1.0-py3-none-any.whl",
+    )
+    version(
+        "22.2.0",
+        sha256="29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836",
+        url="https://pypi.org/packages/fb/6e/6f83bf616d2becdf333a1640f1d463fef3150e2e926b7010cb0f81c95e88/attrs-22.2.0-py3-none-any.whl",
+    )
+    version(
+        "22.1.0",
+        sha256="86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c",
+        url="https://pypi.org/packages/f2/bc/d817287d1aa01878af07c19505fafd1165cd6a119e9d0821ca1d1c20312d/attrs-22.1.0-py2.py3-none-any.whl",
+    )
+    version(
+        "21.4.0",
+        sha256="2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4",
+        url="https://pypi.org/packages/be/be/7abce643bfdf8ca01c48afa2ddf8308c2308b0c3b239a44e57d020afa0ef/attrs-21.4.0-py2.py3-none-any.whl",
+    )
+    version(
+        "21.2.0",
+        sha256="149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1",
+        url="https://pypi.org/packages/20/a9/ba6f1cd1a1517ff022b35acd6a7e4246371dfab08b8e42b829b6d07913cc/attrs-21.2.0-py2.py3-none-any.whl",
+    )
+    version(
+        "20.3.0",
+        sha256="31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+        url="https://pypi.org/packages/c3/aa/cb45262569fcc047bf070b5de61813724d6726db83259222cd7b4c79821a/attrs-20.3.0-py2.py3-none-any.whl",
+    )
+    version(
+        "20.2.0",
+        sha256="fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc",
+        url="https://pypi.org/packages/14/df/479736ae1ef59842f512548bacefad1abed705e400212acba43f9b0fa556/attrs-20.2.0-py2.py3-none-any.whl",
+    )
+    version(
+        "20.1.0",
+        sha256="2867b7b9f8326499ab5b0e2d12801fa5c98842d2cbd22b35112ae04bf85b4dff",
+        url="https://pypi.org/packages/d6/e1/3aa3b03e7643ffd6e499b203fd2a44f79893443e8b0b520d05d3e5c638d5/attrs-20.1.0-py2.py3-none-any.whl",
+    )
+    version(
+        "19.3.0",
+        sha256="08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c",
+        url="https://pypi.org/packages/a2/db/4313ab3be961f7a763066401fb77f7748373b6094076ae2bda2806988af6/attrs-19.3.0-py2.py3-none-any.whl",
+    )
+    version(
+        "19.2.0",
+        sha256="ec20e7a4825331c1b5ebf261d111e16fa9612c1f7a5e1f884f12bd53a664dfd2",
+        url="https://pypi.org/packages/6b/e8/2ecaf86b128a34e225807f03b22664302937ab826bd3b7eccab6754d29ea/attrs-19.2.0-py2.py3-none-any.whl",
+    )
+    version(
+        "19.1.0",
+        sha256="69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79",
+        url="https://pypi.org/packages/23/96/d828354fa2dbdf216eaa7b7de0db692f12c234f7ef888cc14980ef40d1d2/attrs-19.1.0-py2.py3-none-any.whl",
+    )
+    version(
+        "18.1.0",
+        sha256="4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265",
+        url="https://pypi.org/packages/41/59/cedf87e91ed541be7957c501a92102f9cc6363c623a7666d69d51c78ac5b/attrs-18.1.0-py2.py3-none-any.whl",
+    )
+    version(
+        "16.3.0",
+        sha256="c59426b15b45e39a7bc408eb6ba7e7188d9532764f873cc691199ddd975c97ef",
+        url="https://pypi.org/packages/bb/6c/730710c765ab6d4493f460196ab003671d27b38568412a780fc67532b47c/attrs-16.3.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-hatchling", when="@23.1:", type="build")
-    depends_on("py-hatch-vcs", when="@23.1:", type="build")
-    depends_on("py-hatch-fancy-pypi-readme", when="@23.1:", type="build")
-
-    with when("@:22.2.0"):
-        depends_on("py-setuptools@40.6.0:", when="@19.1", type="build")
-        depends_on("py-setuptools", type="build")
-
-    depends_on("py-importlib-metadata", when="@23.1: ^python@3.7", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@23:")
+        depends_on("py-importlib-metadata", when="@23: ^python@:3.7")

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

@@ -16,10 +16,12 @@ class PyAuditwheel(PythonPackage):
 
     license("MIT")
 
-    version("5.1.2", sha256="3ee5830014931ea84af5cd065c637b6614efa03d9b88bd8fbfc924e7ed01d6ba")
+    version(
+        "5.1.2",
+        sha256="4d06aea3ab59a2b8aa733798ac221556a3f5c021fddc42e5de5bcef20201c031",
+        url="https://pypi.org/packages/5e/6d/252b892a851cc43edb523982178da19cf69efc45f5f3aea9752a61813beb/auditwheel-5.1.2-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-setuptools@45:", type="build")
-    depends_on("py-setuptools-scm@6.2:", type="build")
-    depends_on("py-pyelftools@0.24:", type=("build", "run"))
-    depends_on("py-importlib-metadata", when="^python@:3.7", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-importlib-metadata", when="@5 ^python@:3.7")
+        depends_on("py-pyelftools@0.24:", when="@3.1.1:3.1,3.3:")

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

@@ -12,7 +12,12 @@ class PyAutocfg(PythonPackage):
     homepage = "https://github.com/zhreshold/autocfg"
     pypi = "autocfg/autocfg-0.0.8.tar.gz"
 
-    version("0.0.8", sha256="749986b4f3b3bd85b15298734bf8fa4a590e6c34a314ac515025e058ed76c319")
+    version(
+        "0.0.8",
+        sha256="7458f8dc2aff67161a31a7d196c3d34002a34907bace58373394cc3a7107ce2a",
+        url="https://pypi.org/packages/95/f9/74e0a42cbc6d871c92288806e7812c7d2628c2a06557930dbab0a17438d2/autocfg-0.0.8-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-pyyaml", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-dataclasses", when="^python@:3.6")
+        depends_on("py-pyyaml")

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

@@ -16,8 +16,12 @@ class PyAutodocsumm(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.2.11", sha256="183212bd9e9f3b58a96bb21b7958ee4e06224107aa45b2fd894b61b83581b9a9")
+    version(
+        "0.2.11",
+        sha256="f1d0a623bf1ad64d979a9e23fd360d1fb1b8f869beaf3197f711552cddc174e2",
+        url="https://pypi.org/packages/c6/37/0a08e3e1d8b78185837c0c483267b87660ae74cdee0c91dc56ae83093965/autodocsumm-0.2.11-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools@61.0:", type="build")
-    depends_on("py-versioneer+toml", type="build")
-    depends_on("py-sphinx@2.2:7", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@0.2.9:")
+        depends_on("py-sphinx@2.2:", when="@0.2.11:")

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

@@ -14,11 +14,12 @@ class PyAutomat(PythonPackage):
 
     license("MIT")
 
-    version("20.2.0", sha256="7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33")
+    version(
+        "20.2.0",
+        sha256="b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111",
+        url="https://pypi.org/packages/dd/83/5f6f3c1a562674d65efc320257bdc0873ec53147835aeef7762fe7585273/Automat-20.2.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools-scm", type="build")
-    depends_on("py-m2r", type="build")
-
-    depends_on("py-attrs@19.2.0:", type=("build", "run"))
-    depends_on("py-six", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-attrs@19.2:", when="@20:")
+        depends_on("py-six")

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

@@ -15,8 +15,8 @@ class PyAutoray(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.5.3", sha256="ecbecbc1ab65dd704234b3307fa7c7a511a36f6b9339a0ffcdaa4e5a7aab826b")
-
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-setuptools@45:", type="build")
-    depends_on("py-setuptools-scm@6.2:+toml", type="build")
+    version(
+        "0.5.3",
+        sha256="84ccca6f095445559540cc2b2dd25cf258d204ee7608cdc958f49c56b5ae20a2",
+        url="https://pypi.org/packages/60/66/628602262963edbd8e8997cb0082022e7064b8f2585315423a899c437edf/autoray-0.5.3-py3-none-any.whl",
+    )

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

@@ -14,7 +14,8 @@ class PyAuxlib(PythonPackage):
 
     license("ISC")
 
-    version("0.0.43", sha256="0f175637e96a090a785767ce28483cf1aeec316a19afce9b2fbd113e1122786a")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-wheel", type=("build", "run"))
+    version(
+        "0.0.43",
+        sha256="2864e48a0160beda799d404f2321faa0e3b9da33bf1384d5631a8329b1ad32d8",
+        url="https://pypi.org/packages/31/a6/8bc9f3fac7563c9a728595f5aa8eeac1e42f6b66b003900d11db06f7b901/auxlib-0.0.43-py2.py3-none-any.whl",
+    )

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

@@ -15,8 +15,11 @@ class PyAwkward0(PythonPackage):
     homepage = "https://github.com/scikit-hep/awkward-0.x"
     pypi = "awkward0/awkward0-0.15.5.tar.gz"
 
-    version("0.15.5", sha256="156e6e338c56d857a7bb53c4fcc8b0b2592a3470eff0d854e6d68777986359ad")
+    version(
+        "0.15.5",
+        sha256="5fdaa3b29ea2426665215478b9b9199e991da5ab1f1f2996dcbfe848e08a40a1",
+        url="https://pypi.org/packages/9a/b3/376b258ea021eed2c9bdaa1011e0f7b25365157de472d9fae8a2443d9ff5/awkward0-0.15.5-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-pytest-runner", type="build")
-    depends_on("py-numpy@1.13.1:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-numpy@1.13.1:")

var/spack/repos/builtin/packages/py-ax-platform/package.py

@@ -21,19 +21,19 @@ class PyAxPlatform(PythonPackage):
 
     license("MIT")
 
-    version("0.3.1", sha256="0bad1d16155560fdd8644308d2771edf7fd977ad41fea15a7ecf3f224bc36517")
+    version(
+        "0.3.1",
+        sha256="1f9dc8038dd3cf30cf3bd14de49733229a0c1def9a39d740cfd9e4020adf95be",
+        url="https://pypi.org/packages/b8/2e/7aa462e763ab81a515f7d5cea67c691c3403b96ef5f500a47deeb311a8d7/ax_platform-0.3.1-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools@34.4:", type="build")
-    depends_on("py-setuptools-scm", type="build")
-    depends_on("py-botorch@0.8.3:", type=("build", "run"))
-    depends_on("python@3.8:", type=("build", "run"))
-    depends_on("py-jinja2", type=("build", "run"))
-    depends_on("py-pandas", type=("build", "run"))
-    depends_on("py-scipy", type=("build", "run"))
-    depends_on("py-scikit-learn", type=("build", "run"))
-    depends_on("py-ipywidgets", type=("build", "run"))
-    depends_on("py-typeguard@2.13.3", type=("build", "run"))
-    depends_on("py-plotly@5.12.0:", type=("build", "run"))
-
-    def setup_build_environment(self, env):
-        env.set("ALLOW_BOTORCH_LATEST", True)
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@0.2.7:0.3.3")
+        depends_on("py-botorch@0.8.3", when="@0.3.1")
+        depends_on("py-ipywidgets", when="@0.3:")
+        depends_on("py-jinja2")
+        depends_on("py-pandas")
+        depends_on("py-plotly@5.12:", when="@0.3:")
+        depends_on("py-scikit-learn")
+        depends_on("py-scipy")
+        depends_on("py-typeguard@2.13.3:2", when="@0.3.1:0.3.5")

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

@@ -13,20 +13,41 @@ class PyAzureBatch(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python"
     pypi = "azure-batch/azure-batch-9.0.0.zip"
 
-    version("14.0.0", sha256="165b1e99b86f821024c4fae85fb34869d407aa0ebb0ca4b96fb26d859c26c934")
-    version("13.0.0", sha256="e9295de70404d276eda0dd2253d76397439abe5d8f18c1fca199c49b8d6ae30a")
-    version("12.0.0", sha256="1a9b1e178984a7bf495af67bcce51f0db1e4a8a957afb29e33554a14a9674deb")
-    version("11.0.0", sha256="ce5fdb0ec962eddfe85cd82205e9177cb0bbdb445265746e38b3bbbf1f16dc73")
-    version("10.0.0", sha256="83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0")
-    version("9.0.0", sha256="47ca6f50a640915e1cdc5ce3c1307abe5fa3a636236e561119cf62d9df384d84")
+    version(
+        "14.0.0",
+        sha256="3dee0571c3b25e4d46a9f2c4ca910f1837d518bd64cd2fd7d867ea770e054574",
+        url="https://pypi.org/packages/4c/2a/974380e5542fe967aed86b9275d7b1710782b670a2e4aaf21da0aa9c877d/azure_batch-14.0.0-py3-none-any.whl",
+    )
+    version(
+        "13.0.0",
+        sha256="6d2647f579c7de50a20fa8cd9121aca5ab9b102340dd9a900d212f1f377ef2d4",
+        url="https://pypi.org/packages/35/21/0a986af818ea8b365d1328f46d6b86ad39f0515562a5225b3345e725f2dc/azure_batch-13.0.0-py3-none-any.whl",
+    )
+    version(
+        "12.0.0",
+        sha256="10470ab3aa43ec416569b68c1167fe7bea1ea53b54c7fea8842c51ec8a68fd76",
+        url="https://pypi.org/packages/0a/91/a2c0d597176015993a5b889e4897c014cbff6a598691ed9b7a89249a8229/azure_batch-12.0.0-py2.py3-none-any.whl",
+    )
+    version(
+        "11.0.0",
+        sha256="7059a82d1f7e466896d2f24fd4fa040a3717a7c3dc110e21c9fc2e754fc3ac72",
+        url="https://pypi.org/packages/d0/fc/1b63a150b575fd5ed0120fa6e5f8035810d0a596ea4e95bb4d2aedc074d2/azure_batch-11.0.0-py2.py3-none-any.whl",
+    )
+    version(
+        "10.0.0",
+        sha256="706adae8301ee49f2e694584d45296d824e6216057d9b625c11c4b4f5c29b657",
+        url="https://pypi.org/packages/c9/a9/b8d3136a5690ab38b9104fea2c5cc150785c942f8615183d89caab48b388/azure_batch-10.0.0-py2.py3-none-any.whl",
+    )
+    version(
+        "9.0.0",
+        sha256="787871825864fbae3b065d90f1dbb31cc44c5c7ce636a61d9b0950157d7f2216",
+        url="https://pypi.org/packages/3c/86/1168fd710abd7e91606ebf2c46834f3ec6e4c0f2344003cf932768566ef0/azure_batch-9.0.0-py2.py3-none-any.whl",
+    )
+
+    with default_args(type="run"):
+        depends_on("py-azure-common@1.1:")
+        depends_on("py-msrest@0.6.21:", when="@11:12")
+        depends_on("py-msrest@0.5:", when="@5.1.1:10")
+        depends_on("py-msrestazure@0.4.32:", when="@5.1.1:")
 
     # https://github.com/Azure/azure-sdk-for-python/blob/azure-batch_14.0.0/sdk/batch/azure-batch/setup.py
-
-    depends_on("py-setuptools", type="build")
-
-    depends_on("py-msrestazure@0.4.32:1", type=("build", "run"))
-    depends_on("py-azure-common@1.1:1", type=("build", "run"))
-
-    with when("@:12"):
-        depends_on("py-msrest@0.6.21:", when="@11:", type=("build", "run"))
-        depends_on("py-msrest@0.5.0:", type=("build", "run"))

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

@@ -15,7 +15,11 @@ class PyAzureCliCommandModulesNspkg(PythonPackage):
 
     license("MIT")
 
-    version("2.0.3", sha256="4bd62bf5facb92dd4f89080e75eaee2ea1d3dd4e57a3d2a760ce501cf53f4e7d")
+    version(
+        "2.0.3",
+        sha256="41b89d69c402bcbb7db8702733754dcfc52202f1c8c304ecc041c8fccbe90822",
+        url="https://pypi.org/packages/42/51/436547f814054aa131640b6519647b2b0c9c179d1beaa533fa72221fcf0b/azure_cli_command_modules_nspkg-2.0.3-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-azure-cli-nspkg@3.0.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-cli-nspkg@3:", when="@:2.0.0,2.0.2:")

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

@@ -15,25 +15,30 @@ class PyAzureCliCore(PythonPackage):
 
     license("MIT")
 
-    version("2.9.1", sha256="8618a30f7ea2188506f29801220c06396d731c26e4de92c327e6b0e8cc790db5")
+    version(
+        "2.9.1",
+        sha256="28bad5b4a8d90e98af4b556cbe560517a9be7187b0ea05bebe449c6838a03756",
+        url="https://pypi.org/packages/cd/31/8801d6d4e96472e7d13eaf13227be57e1be78b3734ebbb4a79b832c9a8cd/azure_cli_core-2.9.1-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-adal@1.2.3:1.2", type=("build", "run"))
-    depends_on("py-argcomplete@1.8:1", type=("build", "run"))
-    depends_on("py-azure-cli-telemetry", type=("build", "run"))
-    depends_on("py-colorama@0.4.1:0.4", type=("build", "run"))
-    depends_on("py-humanfriendly@4.7:8", type=("build", "run"))
-    depends_on("py-jmespath", type=("build", "run"))
-    depends_on("py-knack@0.7.1", type=("build", "run"))
-    depends_on("py-msal@1.0.0:1.0", type=("build", "run"))
-    depends_on("py-msal-extensions@0.1.3:0.1", type=("build", "run"))
-    depends_on("py-msrest@0.4.4:", type=("build", "run"))
-    depends_on("py-msrestazure@0.6.3:", type=("build", "run"))
-    depends_on("py-paramiko@2.0.8:2", type=("build", "run"))
-    depends_on("py-pyjwt", type=("build", "run"))
-    depends_on("py-pyopenssl@17.1.0:", type=("build", "run"))
-    depends_on("py-requests@2.22:2", type=("build", "run"))
-    depends_on("py-six@1.12:1", type=("build", "run"))
-    depends_on("py-pkginfo@1.5.0.1:", type=("build", "run"))
-    depends_on("py-azure-mgmt-resource@10.0.0", type=("build", "run"))
-    depends_on("py-azure-mgmt-core@1.0.0", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-adal@1.2.3:", when="@2.6:2.19")
+        depends_on("py-argcomplete@1.8:1", when="@:2.43")
+        depends_on("py-azure-cli-nspkg@2:", when="@:2.10")
+        depends_on("py-azure-cli-telemetry", when="@:2.11")
+        depends_on("py-azure-mgmt-core@1.0.0:1.0", when="@2.4:2.10")
+        depends_on("py-azure-mgmt-resource@10:10.0", when="@2.8:2.9")
+        depends_on("py-colorama@0.4.1:", when="@2.6:2.22")
+        depends_on("py-humanfriendly@4.7:8", when="@2.3:2.17")
+        depends_on("py-jmespath")
+        depends_on("py-knack@0.7.1", when="@2.6:2.9")
+        depends_on("py-msal@1:1.0", when="@2.5:2.19")
+        depends_on("py-msal-extensions@0.1.3:0.1", when="@2.5:2.19")
+        depends_on("py-msrest@0.4.4:", when="@:2.15")
+        depends_on("py-msrestazure@0.6.3:", when="@2.4:2.24")
+        depends_on("py-paramiko@2.0.8:2", when="@:2.45")
+        depends_on("py-pkginfo@1.5.0.1:", when="@2.5:")
+        depends_on("py-pyjwt", when="@:2.18")
+        depends_on("py-pyopenssl@17.1:")
+        depends_on("py-requests@2.22:", when="@2.6:2.25")
+        depends_on("py-six@1.12:", when="@:2.29")

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

@@ -15,7 +15,11 @@ class PyAzureCliNspkg(PythonPackage):
 
     license("MIT")
 
-    version("3.0.4", sha256="1bde56090f548c6435bd3093995cf88e4c445fb040604df8b5b5f70780d79181")
+    version(
+        "3.0.4",
+        sha256="34ff69dfed9180aa945bca2c0b7e5603d84e92b28c531efe4beae51a7230791d",
+        url="https://pypi.org/packages/fe/1f/babf85745bc6b1ab770e38a330edd651dde61dd662174adb562d4452d9be/azure_cli_nspkg-3.0.4-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-azure-nspkg@2.0.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-nspkg@2:", when="@3:3.0.0,3.0.2:")

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

@@ -15,8 +15,13 @@ class PyAzureCliTelemetry(PythonPackage):
 
     license("MIT")
 
-    version("1.0.4", sha256="1f239d544d309c29e827982cc20113eb57037dba16db6cdd2e0283e437e0e577")
+    version(
+        "1.0.4",
+        sha256="421e80c2fe3fdff8c38d27ee1fdfdfef1326c79212d6e23a6ebe308d19df552a",
+        url="https://pypi.org/packages/f9/eb/4137d6cf4c91c135260dbf566b5fc8fc6d427b3f807523e388dc030dcc65/azure_cli_telemetry-1.0.4-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-applicationinsights@0.11.1:0.11", type=("build", "run"))
-    depends_on("py-portalocker@1.2:1", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-applicationinsights@0.11.1:", when="@1.0.3:")
+        depends_on("py-azure-cli-nspkg@2:", when="@:1.0.4")
+        depends_on("py-portalocker@1.2:1", when="@1.0.3:1.0.6")

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

@@ -15,92 +15,97 @@ class PyAzureCli(PythonPackage):
 
     license("MIT")
 
-    version("2.9.1", sha256="749d850f73ea8956ab510288c1061dd7066180a8583081a6d560fdc7ac8314d6")
+    version(
+        "2.9.1",
+        sha256="82ddf1cc3050f2f477053fc1cb43aa2647e14483a4355f237f6bd5c81b01592a",
+        url="https://pypi.org/packages/3a/c6/61e1b816a87f6b8cd766d5f4be53c15e43430cece1e1be1e23ea4a6e80ff/azure_cli-2.9.1-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-antlr4-python3-runtime@4.7.2:4.7", type=("build", "run"))
-    depends_on("py-azure-batch@9.0:9", type=("build", "run"))
-    depends_on("py-azure-cli-command-modules-nspkg@2.0:2", type=("build", "run"))
-    depends_on("py-azure-cli-core@2.9.1", type=("build", "run"))
-    depends_on("py-azure-cli-nspkg@3.0.3:3", type=("build", "run"))
-    depends_on("py-azure-cosmos@3.0.2:3", type=("build", "run"))
-    depends_on("py-azure-datalake-store@0.0.48:0.0", type=("build", "run"))
-    depends_on("py-azure-functions-devops-build@0.0.22:0.0", type=("build", "run"))
-    depends_on("py-azure-graphrbac@0.60.0:0.60", type=("build", "run"))
-    depends_on("py-azure-keyvault@1.1:1", type=("build", "run"))
-    depends_on("py-azure-mgmt-advisor@2.0.1:2", type=("build", "run"))
-    depends_on("py-azure-mgmt-apimanagement@0.1.0:0.1", type=("build", "run"))
-    depends_on("py-azure-mgmt-applicationinsights@0.1.1:0.1", type=("build", "run"))
-    depends_on("py-azure-mgmt-appconfiguration@0.4.0:0.4", type=("build", "run"))
-    depends_on("py-azure-mgmt-authorization@0.52.0:0.52", type=("build", "run"))
-    depends_on("py-azure-mgmt-batch@9.0.0:9.0", type=("build", "run"))
-    depends_on("py-azure-mgmt-batchai@2.0:2", type=("build", "run"))
-    depends_on("py-azure-mgmt-billing@0.2:0", type=("build", "run"))
-    depends_on("py-azure-mgmt-botservice@0.2.0:0.2", type=("build", "run"))
-    depends_on("py-azure-mgmt-cdn@4.1.0rc1", type=("build", "run"))
-    depends_on("py-azure-mgmt-cognitiveservices@6.2.0:6.2", type=("build", "run"))
-    depends_on("py-azure-mgmt-compute@13.0:13", type=("build", "run"))
-    depends_on("py-azure-mgmt-consumption@2.0:2", type=("build", "run"))
-    depends_on("py-azure-mgmt-containerinstance@1.4:1", type=("build", "run"))
-    depends_on("py-azure-mgmt-containerregistry@3.0.0rc14", type=("build", "run"))
-    depends_on("py-azure-mgmt-containerservice@9.0.1:9.0", type=("build", "run"))
-    depends_on("py-azure-mgmt-cosmosdb@0.15.0:0.15", type=("build", "run"))
-    depends_on("py-azure-mgmt-datalake-analytics@0.2.1:0.2", type=("build", "run"))
-    depends_on("py-azure-mgmt-datalake-store@0.5.0:0.5", type=("build", "run"))
-    depends_on("py-azure-mgmt-datamigration@0.1.0:0.1", type=("build", "run"))
-    depends_on("py-azure-mgmt-deploymentmanager@0.2.0:0.2", type=("build", "run"))
-    depends_on("py-azure-mgmt-devtestlabs@4.0:4", type=("build", "run"))
-    depends_on("py-azure-mgmt-dns@2.1:2", type=("build", "run"))
-    depends_on("py-azure-mgmt-eventgrid@3.0.0rc7", type=("build", "run"))
-    depends_on("py-azure-mgmt-eventhub@4.0.0:4", type=("build", "run"))
-    depends_on("py-azure-mgmt-hdinsight@1.5.1:1.5", type=("build", "run"))
-    depends_on("py-azure-mgmt-imagebuilder@0.4.0:0.4", type=("build", "run"))
-    depends_on("py-azure-mgmt-iotcentral@3.0.0:3.0", type=("build", "run"))
-    depends_on("py-azure-mgmt-iothub@0.12.0:0.12", type=("build", "run"))
-    depends_on("py-azure-mgmt-iothubprovisioningservices@0.2.0:0.2", type=("build", "run"))
-    depends_on("py-azure-mgmt-keyvault@2.2.0:2.2", type=("build", "run"))
-    depends_on("py-azure-mgmt-kusto@0.3.0:0.3", type=("build", "run"))
-    depends_on("py-azure-mgmt-loganalytics@0.7.0:0.7", type=("build", "run"))
-    depends_on("py-azure-mgmt-managedservices@1.0:1", type=("build", "run"))
-    depends_on("py-azure-mgmt-managementgroups@0.1:0", type=("build", "run"))
-    depends_on("py-azure-mgmt-maps@0.1.0:0.1", type=("build", "run"))
-    depends_on("py-azure-mgmt-marketplaceordering@0.1:0", type=("build", "run"))
-    depends_on("py-azure-mgmt-media@2.1:2", type=("build", "run"))
-    depends_on("py-azure-mgmt-monitor@0.10.0:0.10", type=("build", "run"))
-    depends_on("py-azure-mgmt-msi@0.2:0", type=("build", "run"))
-    depends_on("py-azure-mgmt-netapp@0.8.0:0.8", type=("build", "run"))
-    depends_on("py-azure-mgmt-network@11.0.0:11.0", type=("build", "run"))
-    depends_on("py-azure-mgmt-policyinsights@0.5.0:0.5", type=("build", "run"))
-    depends_on("py-azure-mgmt-privatedns@0.1.0:0.1", type=("build", "run"))
-    depends_on("py-azure-mgmt-rdbms@2.2.0:2.2", type=("build", "run"))
-    depends_on("py-azure-mgmt-recoveryservices@0.4.0:0.4", type=("build", "run"))
-    depends_on("py-azure-mgmt-recoveryservicesbackup@0.6.0:0.6", type=("build", "run"))
-    depends_on("py-azure-mgmt-redhatopenshift@0.1.0", type=("build", "run"))
-    depends_on("py-azure-mgmt-redis@7.0", type=("build", "run"))
-    depends_on("py-azure-mgmt-relay@0.1.0:0.1", type=("build", "run"))
-    depends_on("py-azure-mgmt-reservations@0.6.0", type=("build", "run"))
-    depends_on("py-azure-mgmt-search@2.0:2", type=("build", "run"))
-    depends_on("py-azure-mgmt-security@0.4.1:0.4", type=("build", "run"))
-    depends_on("py-azure-mgmt-servicebus@0.6.0:0.6", type=("build", "run"))
-    depends_on("py-azure-mgmt-servicefabric@0.4.0:0.4", type=("build", "run"))
-    depends_on("py-azure-mgmt-signalr@0.4.0:0.4", type=("build", "run"))
-    depends_on("py-azure-mgmt-sql@0.19.0:0.19", type=("build", "run"))
-    depends_on("py-azure-mgmt-sqlvirtualmachine@0.5.0:0.5", type=("build", "run"))
-    depends_on("py-azure-mgmt-storage@11.1.0:11.1", type=("build", "run"))
-    depends_on("py-azure-mgmt-trafficmanager@0.51.0:0.51", type=("build", "run"))
-    depends_on("py-azure-mgmt-web@0.47.0:0.47", type=("build", "run"))
-    depends_on("py-azure-multiapi-storage@0.3.2:0.3", type=("build", "run"))
-    depends_on("py-azure-loganalytics@0.1.0:0.1", type=("build", "run"))
-    depends_on("py-azure-storage-common@1.4:1", type=("build", "run"))
-    depends_on("py-cryptography@2.3.1:2", type=("build", "run"))
-    depends_on("py-fabric@2.4:2", type=("build", "run"))
-    depends_on("py-jsmin@2.2.2:2.2", type=("build", "run"))
-    depends_on("py-pytz@2019.1", type=("build", "run"))
-    depends_on("py-scp@0.13.2:0.13", type=("build", "run"))
-    depends_on("py-sshtunnel@0.1.4:0.1", type=("build", "run"))
-    depends_on("py-urllib3@1.18:1+secure", type=("build", "run"))
-    depends_on("py-vsts-cd-manager@1.0.2:1.0", type=("build", "run"))
-    depends_on("py-websocket-client@0.56.0:0.56", type=("build", "run"))
-    depends_on("py-xmltodict@0.12:0", type=("build", "run"))
-    depends_on("py-javaproperties@0.5.1", type=("build", "run"))
-    depends_on("py-jsondiff@1.2.0", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-antlr4-python3-runtime@4.7.2:4.7", when="@2.4:2.36")
+        depends_on("py-azure-batch@9", when="@2.4:2.16")
+        depends_on("py-azure-cli-command-modules-nspkg", when="@:2.10")
+        depends_on("py-azure-cli-core@2.9.1:2.9", when="@2.9.1:2.9")
+        depends_on("py-azure-cli-nspkg@3.0.3:", when="@:2.10")
+        depends_on("py-azure-cli-nspkg@2:", when="@:2.10")
+        depends_on("py-azure-cosmos@3.0.2:3")
+        depends_on("py-azure-datalake-store@0.0.48:", when="@:2.10")
+        depends_on("py-azure-functions-devops-build@0.0.22:", when="@:2.29")
+        depends_on("py-azure-graphrbac@0.60")
+        depends_on("py-azure-keyvault@1.1:1", when="@:2.11")
+        depends_on("py-azure-loganalytics", when="@:2.56")
+        depends_on("py-azure-mgmt-advisor@2.0.1:2", when="@:2.25")
+        depends_on("py-azure-mgmt-apimanagement@:0.1", when="@2.3:2.11")
+        depends_on("py-azure-mgmt-appconfiguration@0.4", when="@:2.9")
+        depends_on("py-azure-mgmt-applicationinsights@0.1.1:0.1", when="@:2.24")
+        depends_on("py-azure-mgmt-authorization@0.52", when="@:2.11")
+        depends_on("py-azure-mgmt-batch@9", when="@2.8:2.24")
+        depends_on("py-azure-mgmt-batchai@2", when="@:2.26")
+        depends_on("py-azure-mgmt-billing@0.2:0", when="@:2.14")
+        depends_on("py-azure-mgmt-botservice@0.2", when="@:2.18")
+        depends_on("py-azure-mgmt-cdn@4.1:4", when="@:2.9")
+        depends_on("py-azure-mgmt-cognitiveservices@6.2", when="@2.8:2.13")
+        depends_on("py-azure-mgmt-compute@13", when="@2.9:2.13")
+        depends_on("py-azure-mgmt-consumption@2", when="@:2.51")
+        depends_on("py-azure-mgmt-containerinstance@1.4:1", when="@:2.27")
+        depends_on("py-azure-mgmt-containerregistry@3.0.0-rc14", when="@2.9:2.12")
+        depends_on("py-azure-mgmt-containerservice@9.0.1:9.0", when="@2.4:2.11")
+        depends_on("py-azure-mgmt-cosmosdb@0.15", when="@2.9:2.11")
+        depends_on("py-azure-mgmt-datalake-analytics@0.2.1:0.2", when="@:2.51")
+        depends_on("py-azure-mgmt-datalake-store@0.5:0")
+        depends_on("py-azure-mgmt-datamigration@:0", when="@:2.17")
+        depends_on("py-azure-mgmt-deploymentmanager@0.2:0", when="@:2.45")
+        depends_on("py-azure-mgmt-devtestlabs@4", when="@2.6:")
+        depends_on("py-azure-mgmt-dns@2.1:2", when="@:2.22")
+        depends_on("py-azure-mgmt-eventgrid@3.0.0-rc7", when="@2.9:2.21")
+        depends_on("py-azure-mgmt-eventhub@4:4.0", when="@2.8:2.11")
+        depends_on("py-azure-mgmt-hdinsight@1.5.1:1.5", when="@2.9")
+        depends_on("py-azure-mgmt-imagebuilder@0.4:0", when="@2.8:2.31")
+        depends_on("py-azure-mgmt-iotcentral@3:3.0", when="@2.3:2.19")
+        depends_on("py-azure-mgmt-iothub@0.12", when="@2.6:2.23")
+        depends_on("py-azure-mgmt-iothubprovisioningservices@0.2", when="@:2.27")
+        depends_on("py-azure-mgmt-keyvault@2.2:2", when="@2.3:2.10")
+        depends_on("py-azure-mgmt-kusto@0.3")
+        depends_on("py-azure-mgmt-loganalytics@0.7:0", when="@2.9:2.18")
+        depends_on("py-azure-mgmt-managedservices@1")
+        depends_on("py-azure-mgmt-managementgroups@:0", when="@:2.33")
+        depends_on("py-azure-mgmt-maps@:0.1", when="@:2.26")
+        depends_on("py-azure-mgmt-marketplaceordering@:0", when="@:2.21")
+        depends_on("py-azure-mgmt-media@2.1:2", when="@2.6:2.19")
+        depends_on("py-azure-mgmt-monitor@0.10", when="@2.9")
+        depends_on("py-azure-mgmt-msi@0.2:0", when="@:2.34")
+        depends_on("py-azure-mgmt-netapp@0.8", when="@2.3:2.9")
+        depends_on("py-azure-mgmt-network@11", when="@2.9:2.11")
+        depends_on("py-azure-mgmt-policyinsights@0.5", when="@2.9:2.26")
+        depends_on("py-azure-mgmt-privatedns@:0", when="@:2.23")
+        depends_on("py-azure-mgmt-rdbms@2.2:2", when="@2.3:2.11")
+        depends_on("py-azure-mgmt-recoveryservices@0.4", when="@:2.24")
+        depends_on("py-azure-mgmt-recoveryservicesbackup@0.6", when="@:2.18")
+        depends_on("py-azure-mgmt-redhatopenshift@:0", when="@2.4:2.27")
+        depends_on("py-azure-mgmt-redis@7", when="@:2.26")
+        depends_on("py-azure-mgmt-relay@:0.1", when="@:2.51")
+        depends_on("py-azure-mgmt-reservations@0.6", when="@:2.36")
+        depends_on("py-azure-mgmt-search@2", when="@:2.18")
+        depends_on("py-azure-mgmt-security@0.4.1:0.4", when="@2.8:2.16")
+        depends_on("py-azure-mgmt-servicebus@0.6:0", when="@:2.23")
+        depends_on("py-azure-mgmt-servicefabric@0.4", when="@:2.11")
+        depends_on("py-azure-mgmt-signalr@0.4:0", when="@2.9:2.24")
+        depends_on("py-azure-mgmt-sql@0.19", when="@2.9:2.11")
+        depends_on("py-azure-mgmt-sqlvirtualmachine@0.5:0", when="@:2.27")
+        depends_on("py-azure-mgmt-storage@11.1", when="@2.9:2.11")
+        depends_on("py-azure-mgmt-trafficmanager@0.51:0", when="@:2.32")
+        depends_on("py-azure-mgmt-web@0.47", when="@2.9:2.13")
+        depends_on("py-azure-multiapi-storage@0.3.2:0.3", when="@2.6:2.10")
+        depends_on("py-azure-storage-common@1.4:1", when="@2.9:")
+        depends_on("py-cryptography@2.3.1:2", when="@:2.19")
+        depends_on("py-fabric@2.4:2", when="@:2.56")
+        depends_on("py-javaproperties@0.5.1", when="@:2.28")
+        depends_on("py-jsmin@2.2.2:2", when="@:2.28.0")
+        depends_on("py-jsondiff@1.2", when="@:2.28")
+        depends_on("py-pytz@2019:2019.1", when="@:2.30")
+        depends_on("py-scp@0.13.2:0.13")
+        depends_on("py-sshtunnel@0.1.4:0.1")
+        depends_on("py-urllib3@1.18:1+secure", when="@:2.18")
+        depends_on("py-vsts-cd-manager@1.0.2:", when="@:2.25")
+        depends_on("py-websocket-client@0.56", when="@:2.34")
+        depends_on("py-xmltodict@0.12:")

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

@@ -13,6 +13,8 @@ class PyAzureCommon(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python"
     pypi = "azure-common/azure-common-1.1.25.zip"
 
-    version("1.1.25", sha256="ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "1.1.25",
+        sha256="fd02e4256dc9cdd2d4422bc795bdca2ef302f7a86148b154fbf4ea1f09da400a",
+        url="https://pypi.org/packages/e5/4d/d000fc3c5af601d00d55750b71da5c231fcb128f42ac95b208ed1091c2c1/azure_common-1.1.25-py2.py3-none-any.whl",
+    )

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

@@ -15,33 +15,65 @@ class PyAzureCore(PythonPackage):
 
     license("MIT")
 
-    version("1.30.0", sha256="6f3a7883ef184722f6bd997262eddaf80cfe7e5b3e0caaaf8db1695695893d35")
-    version("1.29.7", sha256="2944faf1a7ff1558b1f457cabf60f279869cabaeef86b353bed8eb032c7d8c5e")
-    version("1.29.2", sha256="beb0fe88d1043d8457318e8fb841d9caa648211092eda213c16b376401f3710d")
-    version("1.28.0", sha256="e9eefc66fc1fde56dab6f04d4e5d12c60754d5a9fa49bdcfd8534fc96ed936bd")
-    version("1.27.1", sha256="5975c20808fa388243f01a8b79021bfbe114f503a27c543f002c5fc8bbdd73dd")
-    version("1.26.4", sha256="075fe06b74c3007950dd93d49440c2f3430fd9b4a5a2756ec8c79454afc989c6")
-    version("1.26.1", sha256="223b0e90cbdd1f03c41b195b03239899843f20d00964dbb85e64386873414a2d")
-    version("1.21.1", sha256="88d2db5cf9a135a7287dc45fdde6b96f9ca62c9567512a3bb3e20e322ce7deb2")
-    version("1.7.0", sha256="a66da240a287f447f9867f54ba09ea235895cec13ea38c5f490ce4eedefdd75c")
-    version("1.6.0", sha256="d10b74e783cff90d56360e61162afdd22276d62dc9467e657ae866449eae7648")
+    version(
+        "1.30.0",
+        sha256="3dae7962aad109610e68c9a7abb31d79720e1d982ddf61363038d175a5025e89",
+        url="https://pypi.org/packages/be/4f/a747b2537fea6302ff3a307b1f9701853e65e215afc1a62fa931d031c57a/azure_core-1.30.0-py3-none-any.whl",
+    )
+    version(
+        "1.29.7",
+        sha256="95a7b41b4af102e5fcdfac9500fcc82ff86e936c7145a099b7848b9ac0501250",
+        url="https://pypi.org/packages/ff/29/dbc7182bc207530c7b5858d59f429158465f878845d64a038afc1aa61e35/azure_core-1.29.7-py3-none-any.whl",
+    )
+    version(
+        "1.29.2",
+        sha256="8e6602f322dc1070caf7e17754beb53b69ffa09df0f4786009a3107e9a00c793",
+        url="https://pypi.org/packages/78/f5/0e2e1eee5548ef539461183024ccdd0397a920b33fdd092c9af489ab1940/azure_core-1.29.2-py3-none-any.whl",
+    )
+    version(
+        "1.28.0",
+        sha256="dec36dfc8eb0b052a853f30c07437effec2f9e3e1fc8f703d9bdaa5cfc0043d9",
+        url="https://pypi.org/packages/c3/0a/32b17d776a6bf5ddaa9dbad0e88de9d28a55bec1d37b8d408cc7d2e5e28d/azure_core-1.28.0-py3-none-any.whl",
+    )
+    version(
+        "1.27.1",
+        sha256="1b4b19f455eb7b4332c6f92adc2c669353ded07c2722eb436165f0c253737792",
+        url="https://pypi.org/packages/71/fa/b6f8f8693de85c69f70ad3b0320a35b663ef1110d32ee2c1064d3dacb0f4/azure_core-1.27.1-py3-none-any.whl",
+    )
+    version(
+        "1.26.4",
+        sha256="d9664b4bc2675d72fba461a285ac43ae33abb2967014a955bf136d9703a2ab3c",
+        url="https://pypi.org/packages/8d/12/8d1b124dcce9a695a8a8907461684ad08af4eca575e59fb2c8c70539caf7/azure_core-1.26.4-py3-none-any.whl",
+    )
+    version(
+        "1.26.1",
+        sha256="726ffd1ded04a2c1cb53f9d9155cbb05ac5c1c2a29af4ef622e93e1c0a8bc92b",
+        url="https://pypi.org/packages/2c/e9/a58441e746621541bf122ed820f756dcfb8ede7b863b5f8e301236cf1e2f/azure_core-1.26.1-py3-none-any.whl",
+    )
+    version(
+        "1.21.1",
+        sha256="3d70e9ec64de92dfae330c15bc69085caceb2d83813ef6c01cc45326f2a4be83",
+        url="https://pypi.org/packages/a6/07/95105c0c1cc46a5c8b14e43c66fa8b50fe1e7f0918e8809a7422cb67a1cf/azure_core-1.21.1-py2.py3-none-any.whl",
+    )
+    version(
+        "1.7.0",
+        sha256="2d1aade2795ea0ac2a903af940c3e0dfe75d25351ec4fc44edf747e97d703dfb",
+        url="https://pypi.org/packages/8b/00/efb68e2dda82139d732090fc3b7ff47fe6f34724ea7ba31e518a854b15c1/azure_core-1.7.0-py2.py3-none-any.whl",
+    )
+    version(
+        "1.6.0",
+        sha256="7bf695b017acea3da28e0390a2dea5b7e15a9fa3ef1af50ff020bcfe7dacb6a4",
+        url="https://pypi.org/packages/a4/ed/ff9f4669e5b9a78a62fe43b83cc01e9007bbf6e99ec7ab6f73557135099f/azure_core-1.6.0-py2.py3-none-any.whl",
+    )
+
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@1.25:")
+        depends_on("py-requests@2.21:", when="@1.29.6:")
+        depends_on("py-requests@2.18.4:", when="@:1.29.5")
+        depends_on("py-six@1.11:", when="@1.11:")
+        depends_on("py-six@1.6:", when="@:1.10")
+        depends_on("py-typing-extensions@4.6:", when="@1.29.2:")
+        depends_on("py-typing-extensions@4.3:", when="@1.26.4:1.29.1")
+        depends_on("py-typing-extensions@4.0.1:", when="@1.23:1.26.3")
 
     # https://github.com/Azure/azure-sdk-for-python/blob/azure-core_1.30.0/sdk/core/azure-core/setup.py
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-anyio@3:4", when="@1.29.6", type=("build", "run"))
-    depends_on("py-requests@2.21:", when="@1.29.6:", type=("build", "run"))
-    depends_on("py-requests@2.18.4:", type=("build", "run"))
-    depends_on("py-six@1.11:", when="@1.21:", type=("build", "run"))
-    depends_on("py-six@1.6:", when="@:1.21", type=("build", "run"))
-    depends_on("py-typing-extensions@4.6:", when="@1.29.2:", type=("build", "run"))
-    depends_on("py-typing-extensions@4.3:", when="@1.26.4:", type=("build", "run"))
-    depends_on("py-typing-extensions@4.0.1:", when="@1.26:", type=("build", "run"))
-
-    def url_for_version(self, version):
-        if version < Version("1.29.3"):
-            return "https://pypi.io/packages/source/a/azure-core/azure-core-{0}.zip".format(
-                version
-            )
-
-        return super().url_for_version(version)

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

@@ -15,14 +15,18 @@ class PyAzureCosmos(PythonPackage):
 
     license("MIT")
 
-    version("4.0.0", sha256="c4e40e0d378fd0c96664f46f1ad08e6c8aaaac31c463726a74aae9eae724442d")
+    version(
+        "4.0.0",
+        sha256="2dbcb33e091b6c3284026472cf3fc3d3ca3cc8bfdc200d469dbd9089f8ba0e54",
+        url="https://pypi.org/packages/af/42/f9df4e1cba74ee5058782ef838b0f6caa0c271670e054c263d69702884e2/azure_cosmos-4.0.0-py2.py3-none-any.whl",
+    )
     version(
         "3.2.0",
-        sha256="4f77cc558fecffac04377ba758ac4e23f076dc1c54e2cf2515f85bc15cbde5c6",
-        url="https://pypi.io/packages/source/a/azure-cosmos/azure-cosmos-3.2.0.tar.gz",
+        sha256="313e766bcf5a1779802c274dec94d5b9cc0e4d0d269489c56606fd2464070fad",
+        url="https://pypi.org/packages/4a/4f/23ffc8e870df94ea6def08121245301e763eaee7236fb8c3d02d5ff66687/azure_cosmos-3.2.0-py2.py3-none-any.whl",
     )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-six@1.6:", type=("build", "run"))
-    depends_on("py-azure-core@1.0.0:1", when="@4:", type=("build", "run"))
-    depends_on("py-requests@2.10.0:", when="@:3", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-core@1.0.0:", when="@4.0.0-beta5:4.3.0-beta1")
+        depends_on("py-requests@2.10:", when="@:3.1.1,3.2:4.0.0-alpha2")
+        depends_on("py-six@1.6:", when="@:3.1.1,3.2:4.2")

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

@@ -13,9 +13,13 @@ class PyAzureDatalakeStore(PythonPackage):
     homepage = "https://github.com/Azure/azure-data-lake-store-python"
     pypi = "azure-datalake-store/azure-datalake-store-0.0.48.tar.gz"
 
-    version("0.0.48", sha256="d27c335783d4add00b3a5f709341e4a8009857440209e15a739a9a96b52386f7")
+    version(
+        "0.0.48",
+        sha256="b35108939f9ac4b6bc568e9b735e3e38a5fdabe00065073b5e48659929d536d1",
+        url="https://pypi.org/packages/27/9a/e7140775b3f8f011ef5d001c12a3519310094375671950105519e30bb12b/azure_datalake_store-0.0.48-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-cffi", type=("build", "run"))
-    depends_on("py-adal@0.4.2:", type=("build", "run"))
-    depends_on("py-requests@2.20.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-adal@0.4.2:", when="@:0.0.52")
+        depends_on("py-cffi")
+        depends_on("py-requests@2.20:")

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

@@ -16,9 +16,13 @@ class PyAzureFunctionsDevopsBuild(PythonPackage):
 
     license("MIT")
 
-    version("0.0.22", sha256="c6341abda6098813f8fa625acd1e925410a17a8a1c7aaabdf975bb7cecb14edf")
+    version(
+        "0.0.22",
+        sha256="adc4c45de5510acf4c094df84b54bc7767e1466e4bfdce23b99ffccf29de3f2f",
+        url="https://pypi.org/packages/96/57/65ca02568edf21abbb0831dedb3f87b6c2164bd4188778865f27b8a05645/azure_functions_devops_build-0.0.22-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-msrest", type=("build", "run"))
-    depends_on("py-vsts", type=("build", "run"))
-    depends_on("py-jinja2", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-jinja2", when="@0.0.18:")
+        depends_on("py-msrest", when="@0.0.18:")
+        depends_on("py-vsts", when="@0.0.18:")

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

@@ -13,10 +13,18 @@ class PyAzureGraphrbac(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python"
     pypi = "azure-graphrbac/azure-graphrbac-0.61.1.zip"
 
-    version("0.61.1", sha256="53e98ae2ca7c19b349e9e9bb1b6a824aeae8dcfcbe17190d20fe69c0f185b2e2")
-    version("0.60.0", sha256="d0bb62d8bf8e196b903f3971ba4afa448e4fe14e8394ebfcdd941d84d62ecafe")
+    version(
+        "0.61.1",
+        sha256="7b4e0f05676acc912f2b33c71c328d9fb2e4dc8e70ebadc9d3de8ab08bf0b175",
+        url="https://pypi.org/packages/3e/93/02056aca45162f9fc275d1eaad12a2a07ef92375afb48eabddc4134b8315/azure_graphrbac-0.61.1-py2.py3-none-any.whl",
+    )
+    version(
+        "0.60.0",
+        sha256="0b266602dfc631dca13960cc64bac172bf9dea2cccbb1aa13d1631ce76f14d79",
+        url="https://pypi.org/packages/bd/11/f78acb88061fbfb3678cb7f2c7d6ad73b69b08bc558aa56246e9ce0d9998/azure_graphrbac-0.60.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-msrest@0.5.0:", type=("build", "run"))
-    depends_on("py-msrestazure@0.4.32:1", type=("build", "run"))
-    depends_on("py-azure-common@1.1:1", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-common@1.1:", when="@0.31:")
+        depends_on("py-msrest@0.5:", when="@0.50:")
+        depends_on("py-msrestazure@0.4.32:", when="@0.50:")

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

@@ -21,36 +21,51 @@ class PyAzureIdentity(PythonPackage):
 
     license("MIT")
 
-    version("1.15.0", sha256="4c28fc246b7f9265610eb5261d65931183d019a23d4b0e99357facb2e6c227c8")
-    version("1.14.1", sha256="48e2a9dbdc59b4f095f841d867d9a8cbe4c1cdbbad8251e055561afd47b4a9b8")
-    version("1.13.0", sha256="c931c27301ffa86b07b4dcf574e29da73e3deba9ab5d1fe4f445bb6a3117e260")
-    version("1.12.0", sha256="7f9b1ae7d97ea7af3f38dd09305e19ab81a1e16ab66ea186b6579d85c1ca2347")
-    version("1.3.1", sha256="5a59c36b4b05bdaec455c390feda71b6495fc828246593404351b9a41c2e877a")
-    version("1.2.0", sha256="b32acd1cdb6202bfe10d9a0858dc463d8960295da70ae18097eb3b85ab12cb91")
+    version(
+        "1.15.0",
+        sha256="a14b1f01c7036f11f148f22cd8c16e05035293d714458d6b44ddf534d93eb912",
+        url="https://pypi.org/packages/30/10/5dbf755b368d10a28d55b06ac1f12512a13e88874a23db82defdea9a8cd9/azure_identity-1.15.0-py3-none-any.whl",
+    )
+    version(
+        "1.14.1",
+        sha256="3a5bef8e9c3281e864e869739be8d67424bff616cddae96b546ca2a5168d863d",
+        url="https://pypi.org/packages/42/b6/e2757da4800e0f402b23d0ca6f1e88726263a501c198729cd865f45f3e22/azure_identity-1.14.1-py3-none-any.whl",
+    )
+    version(
+        "1.13.0",
+        sha256="bd700cebb80cd9862098587c29d8677e819beca33c62568ced6d5a8e5e332b82",
+        url="https://pypi.org/packages/33/16/fa96a5e057d6842e95d94fc410896e061b3d3a2584d57e13fc58268df45f/azure_identity-1.13.0-py3-none-any.whl",
+    )
+    version(
+        "1.12.0",
+        sha256="2a58ce4a209a013e37eaccfd5937570ab99e9118b3e1acf875eed3a85d541b92",
+        url="https://pypi.org/packages/ce/96/942f03d8a80e30e2289496c10d99e3a8b71f10c0b70b5337fd8ec2ae85e5/azure_identity-1.12.0-py3-none-any.whl",
+    )
+    version(
+        "1.3.1",
+        sha256="3775d5d244d65bde19d9ba76b95b1c82484a7a09f8b13140b106bc84df601d35",
+        url="https://pypi.org/packages/dc/55/9b89cd436c145bc11cfb5ebabf2d4a7468a996104a2c26f2674eb3a7bb05/azure_identity-1.3.1-py2.py3-none-any.whl",
+    )
+    version(
+        "1.2.0",
+        sha256="4ce65058461c277991763ed3f121efc6b9eb9c2edefb62c414dfa85c814690d3",
+        url="https://pypi.org/packages/c4/7a/9372cd51fc3408ede0fab950ef9a6518cad34ef36e199982bb1ddfa18512/azure_identity-1.2.0-py2.py3-none-any.whl",
+    )
+
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@1.11.0-beta3:1.15")
+        depends_on("py-azure-core@1.23:", when="@1.15.0:")
+        depends_on("py-azure-core@1.11:", when="@1.7.0-beta2:1.15.0-beta2")
+        depends_on("py-azure-core@1.0.0:", when="@1.0.0:1.7.0-beta1")
+        depends_on("py-cryptography@2.5:", when="@1.7.0-beta4:")
+        depends_on("py-cryptography@2.1.4:", when="@:1.7.0-beta3")
+        depends_on("py-msal@1.24.0:", when="@1.15.0-beta2:")
+        depends_on("py-msal@1.20.0:", when="@1.13:1.15.0-beta1")
+        depends_on("py-msal@1.12:", when="@1.7.0-beta2:1.12")
+        depends_on("py-msal@1:", when="@1.0.1:1.4.0-beta3")
+        depends_on("py-msal-extensions@0.3:", when="@1.10.0:")
+        depends_on("py-msal-extensions@0.1.3:0.1", when="@1.0.1:1.4.0-beta3")
+        depends_on("py-six@1.12:", when="@1.6:1.13")
+        depends_on("py-six@1.6:", when="@1.0.0-beta2:1.5")
 
     # https://github.com/Azure/azure-sdk-for-python/blob/azure-identity_1.15.0/sdk/identity/azure-identity/setup.py
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-azure-core@1.23:1", type=("build", "run"), when="@1.15:")
-    depends_on("py-azure-core@1.11:1", type=("build", "run"), when="@1.12:")
-    depends_on("py-azure-core@1", type=("build", "run"))
-    depends_on("py-cryptography@2.5:", type=("build", "run"), when="@1.12:")
-    depends_on("py-cryptography@2.1.4:", type=("build", "run"))
-    depends_on("py-msal@1.24:1", type=("build", "run"), when="@1.15:")
-    depends_on("py-msal@1.20:1", type=("build", "run"), when="@1.13:")
-    depends_on("py-msal@1.12:1", type=("build", "run"), when="@1.12:")
-    depends_on("py-msal@1", type=("build", "run"))
-    depends_on("py-msal-extensions@0.3:1", type=("build", "run"), when="@1.12:")
-    depends_on("py-msal-extensions@0.1.3:0.1", type=("build", "run"), when="@:1.11")
-    depends_on("py-six@1.12:", type=("build", "run"), when="@1.12")
-    depends_on("py-six@1.6:", type=("build", "run"), when="@:1.11")
-
-    def url_for_version(self, version):
-        if version < Version("1.15"):
-            return (
-                "https://pypi.io/packages/source/a/azure-identity/azure-identity-{0}.zip".format(
-                    version
-                )
-            )
-
-        return super().url_for_version(version)

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

@@ -13,8 +13,12 @@ class PyAzureKeyvaultCertificates(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-certificates"
     pypi = "azure-keyvault-certificates/azure-keyvault-certificates-4.1.0.zip"
 
-    version("4.1.0", sha256="544f56480619e1db350f2e7b117b22af778e02174bd6bcb0af9ae00c50353419")
+    version(
+        "4.1.0",
+        sha256="763f4db3cfa4e1ae86d05812276fa50c6d67269eb77926b8367c09c669f5df79",
+        url="https://pypi.org/packages/4c/98/d557642c6a2f610475edae7a772eeffcfb4bf02f690994e2fba502176fab/azure_keyvault_certificates-4.1.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-azure-core@1.2.1:1", type=("build", "run"))
-    depends_on("py-msrest@0.6.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-core@1.2.1:", when="@4.0.1:4.2.0-beta1")
+        depends_on("py-msrest@0.6.0:", when="@4.0.0-beta6:4.2")

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

@@ -13,9 +13,13 @@ class PyAzureKeyvaultKeys(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-keys"
     pypi = "azure-keyvault-keys/azure-keyvault-keys-4.1.0.zip"
 
-    version("4.1.0", sha256="f9967b4deb48e619f6c40558f69e48978779cc09c8a7fad33d536cfc41cd68f9")
+    version(
+        "4.1.0",
+        sha256="baf18c6a4b1724a783531ae222a83a5c4600d7fbb581e4d694f3ee759ef18579",
+        url="https://pypi.org/packages/bd/11/2b9f1b1dd59337f844b9f857e1bcd1db87af28f84716b6e44fbd48cffea6/azure_keyvault_keys-4.1.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-azure-core@1.2.1:1", type=("build", "run"))
-    depends_on("py-cryptography@2.1.4:", type=("build", "run"))
-    depends_on("py-msrest@0.6.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-core@1.2.1:", when="@4.0.1:4.2.0-beta1")
+        depends_on("py-cryptography@2.1.4:", when="@4.0.0-beta3:")
+        depends_on("py-msrest@0.6.0:", when="@4.0.1:4.3")

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

@@ -13,7 +13,11 @@ class PyAzureKeyvaultNspkg(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault"
     pypi = "azure-keyvault-nspkg/azure-keyvault-nspkg-1.0.0.zip"
 
-    version("1.0.0", sha256="ac68b88aab9c6caf54a23da2a1d1c718d7520bae5adff04dd0a743228269b641")
+    version(
+        "1.0.0",
+        sha256="04f505c736d899da41e81a873ff2edccca53a4a4b451a77a10083722b8002a70",
+        url="https://pypi.org/packages/f2/be/28ff251e315509e7f4b8fa5a5968d72291982a93196752b5b45782af2249/azure_keyvault_nspkg-1.0.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-azure-nspkg@3.0.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-nspkg@3:")

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

@@ -13,8 +13,12 @@ class PyAzureKeyvaultSecrets(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-secrets"
     pypi = "azure-keyvault-secrets/azure-keyvault-secrets-4.1.0.zip"
 
-    version("4.1.0", sha256="4f3bfac60e025e01dd1c1998b73649d45d706975356c0cf147174cf5a6ddf8be")
+    version(
+        "4.1.0",
+        sha256="743a2eabb2bbb21d50b46fa6b321361b9b61121387ec35c0f3d953778793c179",
+        url="https://pypi.org/packages/6e/66/dc763e4ad80ea059d2a3df55fab8fbfb9ce39f79c0fd38f9c469d05bdbea/azure_keyvault_secrets-4.1.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-azure-core@1.2.1:1", type=("build", "run"))
-    depends_on("py-msrest@0.6.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-core@1.2.1:", when="@4.0.1:4.2.0-beta1")
+        depends_on("py-msrest@0.6.0:", when="@4.0.1:4.2")

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

@@ -15,15 +15,24 @@ class PyAzureKeyvault(PythonPackage):
     )
     pypi = "azure-keyvault/azure-keyvault-4.1.0.zip"
 
-    version("4.1.0", sha256="69002a546921a8290eb54d9a3805cfc515c321bc1d4c0bfcfb463620245eca40")
-    version("1.1.0", sha256="37a8e5f376eb5a304fcd066d414b5d93b987e68f9212b0c41efa37d429aadd49")
+    version(
+        "4.1.0",
+        sha256="5fa0438f7f6e2e79543f2724957acf77c3c187e558f4d030a4f9b7493b9f946d",
+        url="https://pypi.org/packages/34/d9/76d295cf6324cc811612710ca5d913015340efb558bdaf5d4a59884958c0/azure_keyvault-4.1.0-py2.py3-none-any.whl",
+    )
+    version(
+        "1.1.0",
+        sha256="dec5334cde846849dfe7896f2e98f17b4f4d75c316a4d30e7171ce71ca20713d",
+        url="https://pypi.org/packages/80/37/e80f577570b32648c4b88c8c48a46501a4868ae4c8d905774fd02c2b01fc/azure_keyvault-1.1.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-azure-keyvault-certificates@4.1:4", when="@4:", type=("build", "run"))
-    depends_on("py-azure-keyvault-secrets@4.1:4", when="@4:", type=("build", "run"))
-    depends_on("py-azure-keyvault-keys@4.1:4", when="@4:", type=("build", "run"))
-    depends_on("py-msrest@0.5.0:", when="@:1", type=("build", "run"))
-    depends_on("py-msrestazure@0.4.32:1", when="@:1", type=("build", "run"))
-    depends_on("py-azure-common@1.1:1", when="@:1", type=("build", "run"))
-    depends_on("py-cryptography@2.1.4:", when="@:1", type=("build", "run"))
-    depends_on("py-requests@2.18.4:", when="@:1", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-common@1.1:", when="@1")
+        depends_on("py-azure-keyvault-certificates@4.1:", when="@4.1")
+        depends_on("py-azure-keyvault-keys@4.1:", when="@4.1")
+        depends_on("py-azure-keyvault-secrets@4.1:", when="@4.1")
+        depends_on("py-azure-nspkg@2:", when="@:0,1.0.0:1")
+        depends_on("py-cryptography@2.1.4:", when="@1")
+        depends_on("py-msrest@0.5:", when="@1.1:1")
+        depends_on("py-msrestazure@0.4.32:", when="@1.1:1")
+        depends_on("py-requests@2.18.4:", when="@1")

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

@@ -13,8 +13,13 @@ class PyAzureLoganalytics(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python"
     pypi = "azure-loganalytics/azure-loganalytics-0.1.0.zip"
 
-    version("0.1.0", sha256="3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e")
+    version(
+        "0.1.0",
+        sha256="5a1bdb33e1fd3dfb275d9eec45ed8e1126eda51e9072ccf08a19922ee5e0ad98",
+        url="https://pypi.org/packages/54/e2/1d30270441a50efce1d52eb426710fc98269eb8bdac44ee966bbd07846da/azure_loganalytics-0.1.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-msrest@0.4.29:1", type=("build", "run"))
-    depends_on("py-azure-common@1.1:1", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-common@1.1:")
+        depends_on("py-azure-nspkg@2:", when="@:0.1.0")
+        depends_on("py-msrest@0.4.29:", when="@:0.1.0")

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

@@ -13,10 +13,18 @@ class PyAzureMgmtAdvisor(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python"
     pypi = "azure-mgmt-advisor/azure-mgmt-advisor-4.0.0.zip"
 
-    version("4.0.0", sha256="1ecea7a9dc48c099c06aab68aace7fdbded91a5522932882b1707c29fa055054")
-    version("2.0.1", sha256="1929d6d5ba49d055fdc806e981b93cf75ea42ba35f78222aaf42d8dcf29d4ef3")
+    version(
+        "4.0.0",
+        sha256="ad923ed8d187b67bd7320107a660f4a9bba9c24ad141dc118e434e848cba39cc",
+        url="https://pypi.org/packages/8d/96/ce9c9dd989e5b338a9979cc0a62661c36579e6830dbcf08ca0192a698001/azure_mgmt_advisor-4.0.0-py2.py3-none-any.whl",
+    )
+    version(
+        "2.0.1",
+        sha256="9e424188d71cd35478bff4591eeee2ceb0b097da87f349bc5de5b39799be26de",
+        url="https://pypi.org/packages/12/52/5b8ff97a7056fd1d4458677e7628b81bb9c22013ec9a761e39d0e9d55498/azure_mgmt_advisor-2.0.1-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-msrest@0.5.0:", type=("build", "run"))
-    depends_on("py-msrestazure@0.4.32:1", type=("build", "run"))
-    depends_on("py-azure-common@1.1:1", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-common@1.1:")
+        depends_on("py-msrest@0.5:", when="@2:9")
+        depends_on("py-msrestazure@0.4.32:", when="@2:4")

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

@@ -13,10 +13,18 @@ class PyAzureMgmtApimanagement(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python"
     pypi = "azure-mgmt-apimanagement/azure-mgmt-apimanagement-0.2.0.zip"
 
-    version("0.2.0", sha256="790f01c0b32583706b8b8c59667c0f5a51cd70444eee76474e23a598911e1d72")
-    version("0.1.0", sha256="5d45d3438c6a11bae6bb8d4d5173cdb44b85683695f9f3433f22f45aecc47819")
+    version(
+        "0.2.0",
+        sha256="815c98f7fb6a3429caea496cb6637b58ee005e710b5f825c8e980318586cc338",
+        url="https://pypi.org/packages/95/4e/0884a860dff4bf16760ec5ed248e6a2a9b9457502fe525ebdeed773c31bf/azure_mgmt_apimanagement-0.2.0-py2.py3-none-any.whl",
+    )
+    version(
+        "0.1.0",
+        sha256="71007d356618d421c208a365f85f334cf21819bd439dbbf4ff252202da74f219",
+        url="https://pypi.org/packages/af/50/6c514ad0850dbd371bdce481661cd4bbd61e569cc44478adf4dc92eeac3c/azure_mgmt_apimanagement-0.1.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-msrest@0.5.0:", type=("build", "run"))
-    depends_on("py-msrestazure@0.4.32:1", type=("build", "run"))
-    depends_on("py-azure-common@1.1:1", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-common@1.1:", when="@:4.0.0")
+        depends_on("py-msrest@0.5:", when="@:2.0")
+        depends_on("py-msrestazure@0.4.32:", when="@:0")

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

@@ -13,10 +13,18 @@ class PyAzureMgmtAppconfiguration(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python"
     pypi = "azure-mgmt-appconfiguration/azure-mgmt-appconfiguration-0.5.0.zip"
 
-    version("0.5.0", sha256="211527511d7616a383cc196956eaf2b7ee016f2367d367924b3715f2a41106da")
-    version("0.4.0", sha256="85f6202ba235fde6be274f3dec1578b90235cf31979abea3fcfa476d0b2ac5b6")
+    version(
+        "0.5.0",
+        sha256="9d7e2ceebc09c8b2b46173712032590769f61ddffc94b9e27fe418345a3e433c",
+        url="https://pypi.org/packages/be/5d/4fb60b2d6a0aac3bc39df7aa97a98c3e28b7274307461b75e2f594613ed6/azure_mgmt_appconfiguration-0.5.0-py2.py3-none-any.whl",
+    )
+    version(
+        "0.4.0",
+        sha256="85b9fdf879d939a14ddb480d5ae5552439da8daf6766f0ba6b2c4218b3fc2c78",
+        url="https://pypi.org/packages/ce/54/5a7379aa323d9c2dfc0438fe30d5def41c66cf6cd7e7a0ab656dbd396fab/azure_mgmt_appconfiguration-0.4.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-msrest@0.5.0:", type=("build", "run"))
-    depends_on("py-msrestazure@0.4.32:1", type=("build", "run"))
-    depends_on("py-azure-common@1.1:1", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-azure-common@1.1:")
+        depends_on("py-msrest@0.5:", when="@:1")
+        depends_on("py-msrestazure@0.4.32:", when="@:0")