py-azure-...: add new versions (#42742)

* py-azure-core: add new versions

* py-azure-identity: add new versions, flatten dependencies

* py-azure-storage-blob: add new versions

* py-msal: add new versions

* py-azure-...: black is terrible

* py-azure-storage-blob: correct dependency

* Reorder

* Reorder

4 files changed, 68 insertions, 34 deletions

diff --git a/var/spack/repos/builtin/packages/py-azure-core/package.py b/var/spack/repos/builtin/packages/py-azure-core/package.py
index 9ef57b3eec..a411e14e1e 100644
--- a/var/spack/repos/builtin/packages/py-azure-core/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-core/package.py
@@ -11,10 +11,12 @@ class PyAzureCore(PythonPackage):
     """Microsoft Azure Core Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/core/azure-core"
-    pypi = "azure-core/azure-core-1.7.0.zip"
+    pypi = "azure-core/azure-core-1.30.0.tar.gz"
 
     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")
@@ -24,12 +26,22 @@ class PyAzureCore(PythonPackage):
     version("1.7.0", sha256="a66da240a287f447f9867f54ba09ea235895cec13ea38c5f490ce4eedefdd75c")
     version("1.6.0", sha256="d10b74e783cff90d56360e61162afdd22276d62dc9467e657ae866449eae7648")
 
-    # https://github.com/Azure/azure-sdk-for-python/blob/azure-core_1.29.2/sdk/core/azure-core/setup.py
+    # 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.6:", when="@:1.21", 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)
diff --git a/var/spack/repos/builtin/packages/py-azure-identity/package.py b/var/spack/repos/builtin/packages/py-azure-identity/package.py
index 47ba08fb28..b3d743a807 100644
--- a/var/spack/repos/builtin/packages/py-azure-identity/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-identity/package.py
@@ -13,7 +13,7 @@ class PyAzureIdentity(PythonPackage):
     homepage = (
         "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/identity/azure-identity"
     )
-    pypi = "azure-identity/azure-identity-1.3.1.zip"
+    pypi = "azure-identity/azure-identity-1.15.0.tar.gz"
 
     # 'azure.identity.aio' import doesn't work for some reason, leave out of
     # 'import_modules' list to ensure that tests still pass for other imports.
@@ -21,27 +21,36 @@ 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")
 
-    # https://github.com/Azure/azure-sdk-for-python/blob/azure-identity_1.14.1/sdk/identity/azure-identity/setup.py
+    # 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")
-
-    with when("@1.12:"):
-        depends_on("py-azure-core@1.11:1", type=("build", "run"))
-        depends_on("py-cryptography@2.5:", type=("build", "run"))
-        depends_on("py-msal@1.20:1", type=("build", "run"), when="@1.13:")
-        depends_on("py-msal@1.12:1", type=("build", "run"))
-        depends_on("py-msal-extensions@0.3:1", type=("build", "run"))
-        depends_on("py-six@1.12:", type=("build", "run"), when="@1.12")
-
-    with when("@:1.11"):
-        depends_on("py-azure-core@1", type=("build", "run"))
-        depends_on("py-cryptography@2.1.4:", type=("build", "run"))
-        depends_on("py-msal@1", type=("build", "run"))
-        depends_on("py-msal-extensions@0.1.3:0.1", type=("build", "run"))
-        depends_on("py-six@1.6:", type=("build", "run"))
+    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)
diff --git a/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py b/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py
index b6b5e2c497..134df401e5 100644
--- a/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py
@@ -11,11 +11,13 @@ class PyAzureStorageBlob(PythonPackage):
     """Microsoft Azure Blob Storage Client Library for Python"""
 
     homepage = "https://github.com/Azure/azure-storage-python"
-    pypi = "azure-storage-blob/azure-storage-blob-12.9.0.zip"
+    pypi = "azure-storage-blob/azure-storage-blob-12.19.0.tar.gz"
     maintainers("marcusboden")
 
     license("MIT")
 
+    version("12.19.0", sha256="26c0a4320a34a3c2a1b74528ba6812ebcb632a04cd67b1c7377232c4b01a5897")
+    version("12.18.3", sha256="d8ced0deee3367fa3d4f3d1a03cd9edadf4440c0a371f503d623fa6c807554ee")
     version("12.17.0", sha256="c14b785a17050b30fc326a315bdae6bc4a078855f4f94a4c303ad74a48dc8c63")
     version("12.16.0", sha256="43b45f19a518a5c6895632f263b3825ebc23574f25cc84b66e1630a6160e466f")
     version("12.15.0", sha256="f8b8d582492740ab16744455408342fb8e4c8897b64a8a3fc31743844722c2f2")
@@ -26,10 +28,9 @@ class PyAzureStorageBlob(PythonPackage):
     version("12.10.0", sha256="3c7dc2c93e7ff2a731acd66a36a1f0a6266072b4154deba4894dab891285ea3a")
     version("12.9.0", sha256="cff66a115c73c90e496c8c8b3026898a3ce64100840276e9245434e28a864225")
 
-    # https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-blob_12.17.0/sdk/storage/azure-storage-blob/setup.py
+    # https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-blob_12.19.0/sdk/storage/azure-storage-blob/setup.py
 
     depends_on("py-setuptools", type="build")
-
     depends_on("py-azure-core@1.28:1", type=("build", "run"), when="@12.17:")
     depends_on("py-azure-core@1.26:1", type=("build", "run"), when="@12.15:")
     depends_on("py-azure-core@1.24.2:1", type=("build", "run"), when="@12.14:")
@@ -40,7 +41,13 @@ class PyAzureStorageBlob(PythonPackage):
     depends_on("py-typing-extensions@4.3:", type=("build", "run"), when="@12.17:")
     depends_on("py-typing-extensions@4.0.1:", type=("build", "run"), when="@12.15:")
     depends_on("py-isodate@0.6.1:", type=("build", "run"), when="@12.15:")
+    depends_on("py-msrest@0.7.1:", type=("build", "run"), when="@12.14")
+    depends_on("py-msrest@0.6.21:", type=("build", "run"), when="@:12.13")
+
+    def url_for_version(self, version):
+        if version < Version("12.18"):
+            return "https://pypi.io/packages/source/a/azure-storage-blob/azure-storage-blob-{0}.zip".format(
+                version
+            )
 
-    with when("@:12.14"):
-        depends_on("py-msrest@0.7.1:", type=("build", "run"), when="@12.14:")
-        depends_on("py-msrest@0.6.21:", type=("build", "run"))
+        return super().url_for_version(version)
diff --git a/var/spack/repos/builtin/packages/py-msal/package.py b/var/spack/repos/builtin/packages/py-msal/package.py
index b742cfd284..518dcf6bea 100644
--- a/var/spack/repos/builtin/packages/py-msal/package.py
+++ b/var/spack/repos/builtin/packages/py-msal/package.py
@@ -14,19 +14,25 @@ class PyMsal(PythonPackage):
     Accounts (MSA) using industry standard OAuth2 and OpenID Connect."""
 
     homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"
-    pypi = "msal/msal-1.3.0.tar.gz"
+    pypi = "msal/msal-1.26.0.tar.gz"
 
     license("MIT")
 
-    # If you get diamond dependency problems on py-pyjwt,
-    # consider using v1.20.0, which has looser constraints
+    version("1.26.0", sha256="224756079fe338be838737682b49f8ebc20a87c1c5eeaf590daae4532b83de15")
     version("1.20.0", sha256="78344cd4c91d6134a593b5e3e45541e666e37b747ff8a6316c3668dd1e6ab6b2")
     version("1.3.0", sha256="5442a3a9d006506e653d3c4daff40538bdf067bf07b6b73b32d1b231d5e77a92")
     version("1.0.0", sha256="ecbe3f5ac77facad16abf08eb9d8562af3bc7184be5d4d90c9ef4db5bde26340")
 
-    # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/1.20.0/setup.py
+    # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/1.26.0/setup.cfg
+
     depends_on("py-setuptools", type="build")
-    depends_on("py-requests@2.0.0:2", type=("build", "run"))
-    depends_on("py-pyjwt@1.0.0:1+crypto", type=("build", "run"), when="@:1.3")
-    depends_on("py-pyjwt@1.0.0:2+crypto", type=("build", "run"), when="@1.20:")
-    depends_on("py-cryptography@0.6:40", type=("build", "run"), when="@1.20:")
+    depends_on("py-requests@2", type=("build", "run"))
+    depends_on("py-pyjwt@1:2+crypto", type=("build", "run"), when="@1.9:")
+    depends_on("py-pyjwt@1+crypto", type=("build", "run"), when="@:1.8")
+    depends_on("py-cryptography@0.6:43", type=("build", "run"), when="@1.24:")
+    depends_on("py-cryptography@0.6:42", type=("build", "run"), when="@1.22:1.23")
+    depends_on("py-cryptography@0.6:40", type=("build", "run"), when="@1.19:1.21")
+    depends_on("py-cryptography@0.6:39", type=("build", "run"), when="@1.18")
+    depends_on("py-cryptography@0.6:38", type=("build", "run"), when="@1.17")
+    depends_on("py-cryptography@0.6:37", type=("build", "run"), when="@1.15:1.16")
+    depends_on("py-cryptography@0.6:3", type=("build", "run"), when="@1.6:1.14")