py-azure-... and py-msrest: add new versions (#42624)

* py-azure-batch: add new versions

* py-azure-core: add new versions

* py-azure-identity: add new versions

* py-azure-mgmt-batch: add new versions

* py-azure-mgmt-core: add new versions

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

* py-msrest: add new versions

* Whitespace

* Whitespace

* py-msrest: add a note

* py-msrest: version-dependent URL

* py-azure-mgmt-batch: correct version of dependency

7 files changed, 91 insertions, 9 deletions

diff --git a/var/spack/repos/builtin/packages/py-azure-batch/package.py b/var/spack/repos/builtin/packages/py-azure-batch/package.py
index 816ca62f6a..680a0d69b7 100644
--- a/var/spack/repos/builtin/packages/py-azure-batch/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-batch/package.py
@@ -13,9 +13,20 @@ 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")
 
+    # 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-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 when("@:12"):
+        depends_on("py-msrest@0.6.21:", when="@11:", type=("build", "run"))
+        depends_on("py-msrest@0.5.0:", type=("build", "run"))
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 de1542547b..9ef57b3eec 100644
--- a/var/spack/repos/builtin/packages/py-azure-core/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-core/package.py
@@ -15,14 +15,21 @@ class PyAzureCore(PythonPackage):
 
     license("MIT")
 
+    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")
 
-    # https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/setup.py
+    # https://github.com/Azure/azure-sdk-for-python/blob/azure-core_1.29.2/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.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"))
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 c18df945b5..47ba08fb28 100644
--- a/var/spack/repos/builtin/packages/py-azure-identity/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-identity/package.py
@@ -21,18 +21,23 @@ class PyAzureIdentity(PythonPackage):
 
     license("MIT")
 
+    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.12.0/sdk/identity/azure-identity/setup.py
+    # https://github.com/Azure/azure-sdk-for-python/blob/azure-identity_1.14.1/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"))
+        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"))
diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py
index 3168d664e4..87f435fa6f 100644
--- a/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py
@@ -11,11 +11,28 @@ class PyAzureMgmtBatch(PythonPackage):
     """Microsoft Azure Batch Management Client Library for Python."""
 
     homepage = "https://github.com/Azure/azure-sdk-for-python"
-    pypi = "azure-mgmt-batch/azure-mgmt-batch-9.0.0.zip"
+    pypi = "azure-mgmt-batch/azure-mgmt-batch-17.1.0.zip"
 
+    version("17.1.0", sha256="385bf920898dc2d5807865fbe45019f10cdfbef651c6dbfa4745a842525dbafb")
+    version("16.2.0", sha256="69691066cd5a2c86e8fdaaefbb80e2940381acedfc8053df193b5214d2ece682")
+    version("15.0.0", sha256="9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb")
+    version("14.0.0", sha256="1d3b2c9ebd57c8874e11d29e7dd05a1f078d2156fc9683e2f2ad41024e448bf6")
+    version("10.0.1", sha256="455e2f1010a59163bfd25d72e9d8dc7847df566795bc35655bcb2de925763d33")
     version("9.0.0", sha256="03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe")
 
+    # https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-batch_14.0.0/sdk/batch/azure-mgmt-batch/setup.py
+
     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-isodate@0.6.1:0", type=("build", "run"), when="@17.1:")
     depends_on("py-azure-common@1.1:1", type=("build", "run"))
+    depends_on("py-azure-mgmt-core@1.2:1", type=("build", "run"), when="@14:")
+    depends_on("py-azure-mgmt-core@1.3:1", type=("build", "run"), when="@16.1:")
+    depends_on("py-azure-mgmt-core@1.3.2:1", type=("build", "run"), when="@17:")
+
+    with when("@:17.0"):
+        depends_on("py-msrest@0.5.0:", type=("build", "run"))
+        depends_on("py-msrest@0.6.21:", type=("build", "run"), when="@16:")
+        depends_on("py-msrest@0.7.1:", type=("build", "run"), when="@17:")
+
+    depends_on("py-msrestazure@0.4.32:1", type=("build", "run"), when="@:10")
diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py
index f1ad352cf8..1b288622f2 100644
--- a/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py
+++ b/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py
@@ -15,9 +15,20 @@ class PyAzureMgmtCore(PythonPackage):
 
     license("MIT")
 
+    version("1.4.0", sha256="d195208340094f98e5a6661b781cde6f6a051e79ce317caabd8ff97030a9b3ae")
+    version("1.3.2", sha256="07f4afe823a55d704b048d61edfdc1318c051ed59f244032126350be95e9d501")
+    version("1.2.2", sha256="4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312")
     version("1.2.0", sha256="8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998")
     version("1.0.0", sha256="510faf49a10daec8346cc086143d8e667ef3b4f8c8022a8e710091027631a55e")
 
+    # https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-core_1.4.0/sdk/core/azure-mgmt-core/setup.py
+
     depends_on("py-setuptools", type="build")
+    depends_on("py-azure-core@1.26.2:1", when="@1.4.0:", type=("build", "run"))
+    depends_on("py-azure-core@1.24:1", when="@1.3.2:", type=("build", "run"))
+    depends_on("py-azure-core@1.23:1", when="@1.3.1:", type=("build", "run"))
+    depends_on("py-azure-core@1.15:1", when="@1.3:", type=("build", "run"))
+    depends_on("py-azure-core@1.9:1", when="@1.2.2:", type=("build", "run"))
+    depends_on("py-azure-core@1.8.2:1", when="@1.2.1:", type=("build", "run"))
     depends_on("py-azure-core@1.7.0:1", when="@1.2:", type=("build", "run"))
     depends_on("py-azure-core@1.4.0:1", type=("build", "run"))
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 b8d5ab38ab..b6b5e2c497 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
@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+
 from spack.package import *
 
 
@@ -15,9 +16,31 @@ class PyAzureStorageBlob(PythonPackage):
 
     license("MIT")
 
+    version("12.17.0", sha256="c14b785a17050b30fc326a315bdae6bc4a078855f4f94a4c303ad74a48dc8c63")
+    version("12.16.0", sha256="43b45f19a518a5c6895632f263b3825ebc23574f25cc84b66e1630a6160e466f")
+    version("12.15.0", sha256="f8b8d582492740ab16744455408342fb8e4c8897b64a8a3fc31743844722c2f2")
+    version("12.14.0", sha256="a72dd9923e4b38a552f2bc1749d1fa5b820f497a8fb3cd2d77e7045bbe87bb4d")
+    version("12.13.1", sha256="899c4b8e2671812d2cf78f107556a27dbb128caaa2bb06094e72a3d5836740af")
+    version("12.12.0", sha256="f6daf07d1ca86d189ae15c9b1859dff5b7127bf24a07a4bbe41e0b81e01d62f7")
+    version("12.11.0", sha256="49535b3190bb69d0d9ff7a383246b14da4d2b1bdff60cae5f9173920c67ca7ee")
+    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
+
     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:")
+    depends_on("py-azure-core@1.23.1:1", type=("build", "run"), when="@12.12:")
+    depends_on("py-azure-core@1.15:1", type=("build", "run"), when="@12.10:")
     depends_on("py-azure-core@1.10:1", type=("build", "run"))
-    depends_on("py-msrest@0.6.21:", type=("build", "run"))
     depends_on("py-cryptography@2.1.4:", type=("build", "run"))
+    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:")
+
+    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"))
diff --git a/var/spack/repos/builtin/packages/py-msrest/package.py b/var/spack/repos/builtin/packages/py-msrest/package.py
index 7466a510be..bad5e43cfa 100644
--- a/var/spack/repos/builtin/packages/py-msrest/package.py
+++ b/var/spack/repos/builtin/packages/py-msrest/package.py
@@ -11,8 +11,15 @@ class PyMsrest(PythonPackage):
     """AutoRest swagger generator Python client runtime."""
 
     homepage = "https://github.com/Azure/msrest-for-python"
-    pypi = "msrest/msrest-0.6.16.tar.gz"
+    pypi = "msrest/msrest-0.7.1.zip"
 
+    def url_for_version(self, version):
+        if Version("0.4.8") < version < Version("0.7"):
+            return "https://pypi.io/packages/source/m/msrest/msrest-{0}.tar.gz".format(version)
+
+        return super().url_for_version(version)
+
+    version("0.7.1", sha256="6e7661f46f3afd88b75667b7187a92829924446c7ea1d169be8c4bb7eeb788b9")
     version("0.6.21", sha256="72661bc7bedc2dc2040e8f170b6e9ef226ee6d3892e01affd4d26b06474d68d8")
     version("0.6.16", sha256="214c5be98954cb45feb6a6a858a7ae6d41a664e80294b65db225bbaa33d9ca3c")
 
@@ -21,3 +28,4 @@ class PyMsrest(PythonPackage):
     depends_on("py-requests-oauthlib@0.5.0:", type=("build", "run"))
     depends_on("py-isodate@0.6.0:", type=("build", "run"))
     depends_on("py-certifi@2017.4.17:", type=("build", "run"))
+    depends_on("py-azure-core@1.24:", type=("build", "run"), when="@0.7.1:")