Update packages for running azure (#34403)

* Update packages for running azure

* Update py-msal-extensions

* Respond to comments

4 files changed, 24 insertions, 6 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 2ec14195d4..a891c6d6e2 100644
--- a/var/spack/repos/builtin/packages/py-azure-core/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-core/package.py
@@ -13,11 +13,14 @@ class PyAzureCore(PythonPackage):
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/core/azure-core"
     pypi = "azure-core/azure-core-1.7.0.zip"
 
+    version("1.26.1", sha256="223b0e90cbdd1f03c41b195b03239899843f20d00964dbb85e64386873414a2d")
     version("1.21.1", sha256="88d2db5cf9a135a7287dc45fdde6b96f9ca62c9567512a3bb3e20e322ce7deb2")
     version("1.7.0", sha256="a66da240a287f447f9867f54ba09ea235895cec13ea38c5f490ce4eedefdd75c")
     version("1.6.0", sha256="d10b74e783cff90d56360e61162afdd22276d62dc9467e657ae866449eae7648")
 
+    # https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/setup.py
     depends_on("py-setuptools", type="build")
     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-typing-extensions@4.0.1:", when="@1.26:", type=("build", "run"))
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 2bf754edbe..b531e5ba8f 100644
--- a/var/spack/repos/builtin/packages/py-azure-identity/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-identity/package.py
@@ -19,12 +19,22 @@ class PyAzureIdentity(PythonPackage):
     # 'import_modules' list to ensure that tests still pass for other imports.
     import_modules = ["azure.identity", "azure.identity._internal", "azure.identity._credentials"]
 
+    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.12.0/sdk/identity/azure-identity/setup.py
     depends_on("py-setuptools", type="build")
-    depends_on("py-azure-core@1.0.0:1", type=("build", "run"))
-    depends_on("py-cryptography@2.1.4:", type=("build", "run"))
-    depends_on("py-msal@1.0.0: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"))
+    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.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"))
+
+    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"))
diff --git a/var/spack/repos/builtin/packages/py-msal-extensions/package.py b/var/spack/repos/builtin/packages/py-msal-extensions/package.py
index 55361541a6..8aaba327e7 100644
--- a/var/spack/repos/builtin/packages/py-msal-extensions/package.py
+++ b/var/spack/repos/builtin/packages/py-msal-extensions/package.py
@@ -16,9 +16,13 @@ class PyMsalExtensions(PythonPackage):
     homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"
     pypi = "msal-extensions/msal-extensions-0.2.2.tar.gz"
 
+    version("1.0.0", sha256="c676aba56b0cce3783de1b5c5ecfe828db998167875126ca4b47dc6436451354")
     version("0.2.2", sha256="31414753c484679bb3b6c6401623eb4c3ccab630af215f2f78c1d5c4f8e1d1a9")
     version("0.1.3", sha256="59e171a9a4baacdbf001c66915efeaef372fb424421f1a4397115a3ddd6205dc")
 
+    # https://github.com/AzureAD/microsoft-authentication-extensions-for-python/blob/1.0.0/setup.py
     depends_on("py-setuptools", type="build")
     depends_on("py-msal@0.4.1:1", type=("build", "run"))
-    depends_on("py-portalocker@1.0:1", type=("build", "run"))
+    depends_on("py-portalocker@1", when="@:0", type=("build", "run"))
+    # This is the earliest version to work for Windows and non-Windows
+    depends_on("py-portalocker@1.6:1", when="@1:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-msal/package.py b/var/spack/repos/builtin/packages/py-msal/package.py
index 1fe6831a3f..5af9b09bf6 100644
--- a/var/spack/repos/builtin/packages/py-msal/package.py
+++ b/var/spack/repos/builtin/packages/py-msal/package.py
@@ -22,6 +22,7 @@ class PyMsal(PythonPackage):
     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
     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")