diff --git a/.hatch/requirements-docs.txt b/.hatch/requirements-docs.txt index e67051ee86..afebb2592b 100644 --- a/.hatch/requirements-docs.txt +++ b/.hatch/requirements-docs.txt @@ -7,26 +7,26 @@ # - azure-keyvault-certificates==4.9.0 # - azure-keyvault-keys==4.10.0 # - azure-keyvault-secrets==4.9.0 -# - azure-mgmt-compute==33.1.0 +# - azure-mgmt-compute==34.0.0 # - azure-mgmt-containerinstance==10.1.0 # - azure-mgmt-dns==8.2.0 # - azure-mgmt-keyvault==10.3.1 # - azure-mgmt-msi==7.0.0 # - azure-mgmt-rdbms==10.1.0 # - azure-mgmt-resource==23.2.0 -# - azure-mgmt-storage==21.2.1 -# - azure-storage-blob==12.24.0 -# - azure-storage-file-datalake==12.18.0 -# - azure-storage-file-share==12.20.0 +# - azure-mgmt-storage==22.0.0 +# - azure-storage-blob==12.24.1 +# - azure-storage-file-datalake==12.18.1 +# - azure-storage-file-share==12.20.1 # - chevron==0.14.0 # - cryptography==44.0.0 # - fqdn==1.5.1 # - psycopg[binary]==3.1.19 -# - pulumi-azure-native==2.82.0 -# - pulumi-azuread==6.1.0 +# - pulumi-azure-native==2.84.0 +# - pulumi-azuread==6.2.0 # - pulumi-random==4.17.0 -# - pulumi==3.146.0 -# - pydantic==2.10.5 +# - pulumi==3.147.0 +# - pydantic==2.10.6 # - pyjwt[crypto]==2.10.1 # - pytz==2024.2 # - pyyaml==6.0.2 @@ -54,7 +54,7 @@ appdirs==1.4.4 # via hatch.envs.docs arpeggio==2.0.2 # via parver -attrs==24.3.0 +attrs==25.1.0 # via parver azure-common==1.1.28 # via @@ -86,7 +86,7 @@ azure-keyvault-keys==4.10.0 # via hatch.envs.docs azure-keyvault-secrets==4.9.0 # via hatch.envs.docs -azure-mgmt-compute==33.1.0 +azure-mgmt-compute==34.0.0 # via hatch.envs.docs azure-mgmt-containerinstance==10.1.0 # via hatch.envs.docs @@ -110,15 +110,15 @@ azure-mgmt-rdbms==10.1.0 # via hatch.envs.docs azure-mgmt-resource==23.2.0 # via hatch.envs.docs -azure-mgmt-storage==21.2.1 +azure-mgmt-storage==22.0.0 # via hatch.envs.docs -azure-storage-blob==12.24.0 +azure-storage-blob==12.24.1 # via # hatch.envs.docs # azure-storage-file-datalake -azure-storage-file-datalake==12.18.0 +azure-storage-file-datalake==12.18.1 # via hatch.envs.docs -azure-storage-file-share==12.20.0 +azure-storage-file-share==12.20.1 # via hatch.envs.docs babel==2.16.0 # via @@ -193,7 +193,7 @@ jinja2==3.1.5 # via # myst-parser # sphinx -josepy==1.14.0 +josepy==1.15.0 # via acme markdown-it-py==3.0.0 # via @@ -229,27 +229,27 @@ parver==0.5 # pulumi-random portalocker==2.10.1 # via msal-extensions -protobuf==4.25.5 +protobuf==4.25.6 # via pulumi psycopg==3.1.19 # via hatch.envs.docs psycopg-binary==3.1.19 # via psycopg -pulumi==3.146.0 +pulumi==3.147.0 # via # hatch.envs.docs # pulumi-azure-native # pulumi-azuread # pulumi-random -pulumi-azure-native==2.82.0 +pulumi-azure-native==2.84.0 # via hatch.envs.docs -pulumi-azuread==6.1.0 +pulumi-azuread==6.2.0 # via hatch.envs.docs pulumi-random==4.17.0 # via hatch.envs.docs pycparser==2.22 # via cffi -pydantic==2.10.5 +pydantic==2.10.6 # via hatch.envs.docs pydantic-core==2.27.2 # via pydantic @@ -353,6 +353,7 @@ typing-extensions==4.12.2 # azure-mgmt-dns # azure-mgmt-keyvault # azure-mgmt-resource + # azure-mgmt-storage # azure-storage-blob # azure-storage-file-datalake # azure-storage-file-share diff --git a/.hatch/requirements-lint.txt b/.hatch/requirements-lint.txt index 140fb0feb8..f1189477fe 100644 --- a/.hatch/requirements-lint.txt +++ b/.hatch/requirements-lint.txt @@ -1,13 +1,13 @@ # # This file is autogenerated by hatch-pip-compile with Python 3.12 # -# - ansible-dev-tools==24.12.0 +# - ansible-dev-tools==25.1.0 # - ansible==11.1.0 # - black==24.10.0 # - mypy==1.14.1 # - pandas-stubs==2.2.3.241126 -# - pydantic==2.10.5 -# - ruff==0.9.2 +# - pydantic==2.10.6 +# - ruff==0.9.3 # - types-appdirs==1.4.3.5 # - types-chevron==0.14.2.20250103 # - types-pytz==2024.2.0.20241221 @@ -38,25 +38,25 @@ ansible-core==2.18.1 # pytest-ansible ansible-creator==25.0.0 # via ansible-dev-tools -ansible-dev-environment==24.12.0 +ansible-dev-environment==25.1.0 # via ansible-dev-tools -ansible-dev-tools==24.12.0 +ansible-dev-tools==25.1.0 # via hatch.envs.lint -ansible-lint==24.12.2 +ansible-lint==25.1.0 # via # ansible-dev-tools # ansible-navigator -ansible-navigator==24.12.0 +ansible-navigator==25.1.0 # via ansible-dev-tools ansible-runner==2.4.0 # via ansible-navigator ansible-sign==0.1.1 # via ansible-dev-tools -attrs==24.3.0 +attrs==25.1.0 # via # jsonschema # referencing -bindep==2.11.0 +bindep==2.12.0 # via ansible-builder black==24.10.0 # via @@ -64,7 +64,7 @@ black==24.10.0 # ansible-lint bracex==2.5.post1 # via wcmatch -cachetools==5.5.0 +cachetools==5.5.1 # via tox cffi==1.17.1 # via @@ -93,12 +93,12 @@ enrich==1.2.7 # via molecule execnet==2.1.1 # via pytest-xdist -filelock==3.16.1 +filelock==3.17.0 # via # ansible-lint # tox # virtualenv -importlib-metadata==8.5.0 +importlib-metadata==8.6.1 # via ansible-lint iniconfig==2.0.0 # via pytest @@ -125,7 +125,7 @@ markupsafe==3.0.2 # via jinja2 mdurl==0.1.2 # via markdown-it-py -molecule==24.12.0 +molecule==25.1.0 # via ansible-dev-tools mypy==1.14.1 # via hatch.envs.lint @@ -178,20 +178,20 @@ ptyprocess==0.7.0 # via pexpect pycparser==2.22 # via cffi -pydantic==2.10.5 +pydantic==2.10.6 # via hatch.envs.lint pydantic-core==2.27.2 # via pydantic pygments==2.19.1 # via rich -pyproject-api==1.8.0 +pyproject-api==1.9.0 # via tox pytest==8.3.4 # via # pytest-ansible # pytest-xdist # tox-ansible -pytest-ansible==24.12.0 +pytest-ansible==25.1.0 # via # ansible-dev-tools # tox-ansible @@ -214,7 +214,7 @@ pyyaml==6.0.2 # molecule # tox-ansible # yamllint -referencing==0.36.1 +referencing==0.36.2 # via # jsonschema # jsonschema-specifications @@ -232,16 +232,16 @@ ruamel-yaml==0.18.10 # via ansible-lint ruamel-yaml-clib==0.2.12 # via ruamel-yaml -ruff==0.9.2 +ruff==0.9.3 # via hatch.envs.lint subprocess-tee==0.4.2 # via # ansible-compat # ansible-dev-environment # ansible-lint -tox==4.23.2 +tox==4.24.1 # via tox-ansible -tox-ansible==24.12.0 +tox-ansible==25.1.0 # via ansible-dev-tools types-appdirs==1.4.3.5 # via hatch.envs.lint @@ -261,7 +261,7 @@ typing-extensions==4.12.2 # pydantic # pydantic-core # referencing -tzdata==2024.2 +tzdata==2025.1 # via ansible-navigator urllib3==2.3.0 # via types-requests diff --git a/.hatch/requirements-test.txt b/.hatch/requirements-test.txt index 4c13802c89..429c50ebb4 100644 --- a/.hatch/requirements-test.txt +++ b/.hatch/requirements-test.txt @@ -1,7 +1,7 @@ # # This file is autogenerated by hatch-pip-compile with Python 3.12 # -# [constraints] .hatch/requirements.txt (SHA256: 258f70bf31f257535e69892e928718b81d0e8e0e1222a98df4495c23835da12e) +# [constraints] .hatch/requirements.txt (SHA256: 971971dd2899e7f5a63471a3b79486b86141dbbc8c9b8f981c2d3d8ae166338f) # # - appdirs==1.4.4 # - azure-core==1.32.0 @@ -9,26 +9,26 @@ # - azure-keyvault-certificates==4.9.0 # - azure-keyvault-keys==4.10.0 # - azure-keyvault-secrets==4.9.0 -# - azure-mgmt-compute==33.1.0 +# - azure-mgmt-compute==34.0.0 # - azure-mgmt-containerinstance==10.1.0 # - azure-mgmt-dns==8.2.0 # - azure-mgmt-keyvault==10.3.1 # - azure-mgmt-msi==7.0.0 # - azure-mgmt-rdbms==10.1.0 # - azure-mgmt-resource==23.2.0 -# - azure-mgmt-storage==21.2.1 -# - azure-storage-blob==12.24.0 -# - azure-storage-file-datalake==12.18.0 -# - azure-storage-file-share==12.20.0 +# - azure-mgmt-storage==22.0.0 +# - azure-storage-blob==12.24.1 +# - azure-storage-file-datalake==12.18.1 +# - azure-storage-file-share==12.20.1 # - chevron==0.14.0 # - cryptography==44.0.0 # - fqdn==1.5.1 # - psycopg[binary]==3.1.19 -# - pulumi-azure-native==2.82.0 -# - pulumi-azuread==6.1.0 +# - pulumi-azure-native==2.84.0 +# - pulumi-azuread==6.2.0 # - pulumi-random==4.17.0 -# - pulumi==3.146.0 -# - pydantic==2.10.5 +# - pulumi==3.147.0 +# - pydantic==2.10.6 # - pyjwt[crypto]==2.10.1 # - pytz==2024.2 # - pyyaml==6.0.2 @@ -59,7 +59,7 @@ arpeggio==2.0.2 # via # -c .hatch/requirements.txt # parver -attrs==24.3.0 +attrs==25.1.0 # via # -c .hatch/requirements.txt # parver @@ -103,7 +103,7 @@ azure-keyvault-secrets==4.9.0 # via # -c .hatch/requirements.txt # hatch.envs.test -azure-mgmt-compute==33.1.0 +azure-mgmt-compute==34.0.0 # via # -c .hatch/requirements.txt # hatch.envs.test @@ -142,20 +142,20 @@ azure-mgmt-resource==23.2.0 # via # -c .hatch/requirements.txt # hatch.envs.test -azure-mgmt-storage==21.2.1 +azure-mgmt-storage==22.0.0 # via # -c .hatch/requirements.txt # hatch.envs.test -azure-storage-blob==12.24.0 +azure-storage-blob==12.24.1 # via # -c .hatch/requirements.txt # hatch.envs.test # azure-storage-file-datalake -azure-storage-file-datalake==12.18.0 +azure-storage-file-datalake==12.18.1 # via # -c .hatch/requirements.txt # hatch.envs.test -azure-storage-file-share==12.20.0 +azure-storage-file-share==12.20.1 # via # -c .hatch/requirements.txt # hatch.envs.test @@ -239,7 +239,7 @@ isodate==0.7.2 # azure-storage-file-datalake # azure-storage-file-share # msrest -josepy==1.14.0 +josepy==1.15.0 # via # -c .hatch/requirements.txt # acme @@ -283,7 +283,7 @@ portalocker==2.10.1 # via # -c .hatch/requirements.txt # msal-extensions -protobuf==4.25.5 +protobuf==4.25.6 # via # -c .hatch/requirements.txt # pulumi @@ -295,18 +295,18 @@ psycopg-binary==3.1.19 # via # -c .hatch/requirements.txt # psycopg -pulumi==3.146.0 +pulumi==3.147.0 # via # -c .hatch/requirements.txt # hatch.envs.test # pulumi-azure-native # pulumi-azuread # pulumi-random -pulumi-azure-native==2.82.0 +pulumi-azure-native==2.84.0 # via # -c .hatch/requirements.txt # hatch.envs.test -pulumi-azuread==6.1.0 +pulumi-azuread==6.2.0 # via # -c .hatch/requirements.txt # hatch.envs.test @@ -318,7 +318,7 @@ pycparser==2.22 # via # -c .hatch/requirements.txt # cffi -pydantic==2.10.5 +pydantic==2.10.6 # via # -c .hatch/requirements.txt # hatch.envs.test @@ -419,6 +419,7 @@ typing-extensions==4.12.2 # azure-mgmt-dns # azure-mgmt-keyvault # azure-mgmt-resource + # azure-mgmt-storage # azure-storage-blob # azure-storage-file-datalake # azure-storage-file-share diff --git a/.hatch/requirements.txt b/.hatch/requirements.txt index 3b89fde299..06bf076879 100644 --- a/.hatch/requirements.txt +++ b/.hatch/requirements.txt @@ -7,26 +7,26 @@ # - azure-keyvault-certificates==4.9.0 # - azure-keyvault-keys==4.10.0 # - azure-keyvault-secrets==4.9.0 -# - azure-mgmt-compute==33.1.0 +# - azure-mgmt-compute==34.0.0 # - azure-mgmt-containerinstance==10.1.0 # - azure-mgmt-dns==8.2.0 # - azure-mgmt-keyvault==10.3.1 # - azure-mgmt-msi==7.0.0 # - azure-mgmt-rdbms==10.1.0 # - azure-mgmt-resource==23.2.0 -# - azure-mgmt-storage==21.2.1 -# - azure-storage-blob==12.24.0 -# - azure-storage-file-datalake==12.18.0 -# - azure-storage-file-share==12.20.0 +# - azure-mgmt-storage==22.0.0 +# - azure-storage-blob==12.24.1 +# - azure-storage-file-datalake==12.18.1 +# - azure-storage-file-share==12.20.1 # - chevron==0.14.0 # - cryptography==44.0.0 # - fqdn==1.5.1 # - psycopg[binary]==3.1.19 -# - pulumi-azure-native==2.82.0 -# - pulumi-azuread==6.1.0 +# - pulumi-azure-native==2.84.0 +# - pulumi-azuread==6.2.0 # - pulumi-random==4.17.0 -# - pulumi==3.146.0 -# - pydantic==2.10.5 +# - pulumi==3.147.0 +# - pydantic==2.10.6 # - pyjwt[crypto]==2.10.1 # - pytz==2024.2 # - pyyaml==6.0.2 @@ -44,7 +44,7 @@ appdirs==1.4.4 # via hatch.envs.default arpeggio==2.0.2 # via parver -attrs==24.3.0 +attrs==25.1.0 # via parver azure-common==1.1.28 # via @@ -76,7 +76,7 @@ azure-keyvault-keys==4.10.0 # via hatch.envs.default azure-keyvault-secrets==4.9.0 # via hatch.envs.default -azure-mgmt-compute==33.1.0 +azure-mgmt-compute==34.0.0 # via hatch.envs.default azure-mgmt-containerinstance==10.1.0 # via hatch.envs.default @@ -100,15 +100,15 @@ azure-mgmt-rdbms==10.1.0 # via hatch.envs.default azure-mgmt-resource==23.2.0 # via hatch.envs.default -azure-mgmt-storage==21.2.1 +azure-mgmt-storage==22.0.0 # via hatch.envs.default -azure-storage-blob==12.24.0 +azure-storage-blob==12.24.1 # via # hatch.envs.default # azure-storage-file-datalake -azure-storage-file-datalake==12.18.0 +azure-storage-file-datalake==12.18.1 # via hatch.envs.default -azure-storage-file-share==12.20.0 +azure-storage-file-share==12.20.1 # via hatch.envs.default certifi==2024.12.14 # via @@ -161,7 +161,7 @@ isodate==0.7.2 # azure-storage-file-datalake # azure-storage-file-share # msrest -josepy==1.14.0 +josepy==1.15.0 # via acme markdown-it-py==3.0.0 # via rich @@ -186,27 +186,27 @@ parver==0.5 # pulumi-random portalocker==2.10.1 # via msal-extensions -protobuf==4.25.5 +protobuf==4.25.6 # via pulumi psycopg==3.1.19 # via hatch.envs.default psycopg-binary==3.1.19 # via psycopg -pulumi==3.146.0 +pulumi==3.147.0 # via # hatch.envs.default # pulumi-azure-native # pulumi-azuread # pulumi-random -pulumi-azure-native==2.82.0 +pulumi-azure-native==2.84.0 # via hatch.envs.default -pulumi-azuread==6.1.0 +pulumi-azuread==6.2.0 # via hatch.envs.default pulumi-random==4.17.0 # via hatch.envs.default pycparser==2.22 # via cffi -pydantic==2.10.5 +pydantic==2.10.6 # via hatch.envs.default pydantic-core==2.27.2 # via pydantic @@ -270,6 +270,7 @@ typing-extensions==4.12.2 # azure-mgmt-dns # azure-mgmt-keyvault # azure-mgmt-resource + # azure-mgmt-storage # azure-storage-blob # azure-storage-file-datalake # azure-storage-file-share diff --git a/data_safe_haven/external/api/azure_sdk.py b/data_safe_haven/external/api/azure_sdk.py index 1792988348..3ae0c4c3de 100644 --- a/data_safe_haven/external/api/azure_sdk.py +++ b/data_safe_haven/external/api/azure_sdk.py @@ -46,8 +46,8 @@ from azure.mgmt.resource.resources.v2021_04_01.models import ResourceGroup from azure.mgmt.resource.subscriptions import SubscriptionClient from azure.mgmt.resource.subscriptions.models import Location, Subscription -from azure.mgmt.storage.v2021_08_01 import StorageManagementClient -from azure.mgmt.storage.v2021_08_01.models import ( +from azure.mgmt.storage.v2023_05_01 import StorageManagementClient +from azure.mgmt.storage.v2023_05_01.models import ( BlobContainer, Kind as StorageAccountKind, MinimumTlsVersion, diff --git a/pyproject.toml b/pyproject.toml index 2db9b15db4..2102560512 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,26 +30,26 @@ dependencies = [ "azure-keyvault-certificates==4.9.0", "azure-keyvault-keys==4.10.0", "azure-keyvault-secrets==4.9.0", - "azure-mgmt-compute==33.1.0", + "azure-mgmt-compute==34.0.0", "azure-mgmt-containerinstance==10.1.0", "azure-mgmt-dns==8.2.0", "azure-mgmt-keyvault==10.3.1", "azure-mgmt-msi==7.0.0", "azure-mgmt-rdbms==10.1.0", "azure-mgmt-resource==23.2.0", - "azure-mgmt-storage==21.2.1", - "azure-storage-blob==12.24.0", - "azure-storage-file-datalake==12.18.0", - "azure-storage-file-share==12.20.0", + "azure-mgmt-storage==22.0.0", + "azure-storage-blob==12.24.1", + "azure-storage-file-datalake==12.18.1", + "azure-storage-file-share==12.20.1", "chevron==0.14.0", "cryptography==44.0.0", "fqdn==1.5.1", "psycopg[binary]==3.1.19", # needed for installation on older MacOS versions - "pulumi-azure-native==2.82.0", - "pulumi-azuread==6.1.0", + "pulumi-azure-native==2.84.0", + "pulumi-azuread==6.2.0", "pulumi-random==4.17.0", - "pulumi==3.146.0", - "pydantic==2.10.5", + "pulumi==3.147.0", + "pydantic==2.10.6", "pyjwt[crypto]==2.10.1", "pytz==2024.2", "pyyaml==6.0.2", @@ -74,13 +74,13 @@ docs = [ "sphinxcontrib-typer==0.5.1", ] lint = [ - "ansible-dev-tools==24.12.0", + "ansible-dev-tools==25.1.0", "ansible==11.1.0", "black==24.10.0", "mypy==1.14.1", "pandas-stubs==2.2.3.241126", - "pydantic==2.10.5", - "ruff==0.9.2", + "pydantic==2.10.6", + "ruff==0.9.3", "types-appdirs==1.4.3.5", "types-chevron==0.14.2.20250103", "types-pytz==2024.2.0.20241221", diff --git a/tests/external/api/test_azure_sdk.py b/tests/external/api/test_azure_sdk.py index 9d93a08e1c..1cb2bd2e95 100644 --- a/tests/external/api/test_azure_sdk.py +++ b/tests/external/api/test_azure_sdk.py @@ -3,7 +3,7 @@ from azure.mgmt.keyvault.v2023_07_01.models import DeletedVault from azure.mgmt.resource.subscriptions import SubscriptionClient from azure.mgmt.resource.subscriptions.models import Subscription -from azure.mgmt.storage.v2021_08_01.models import ( +from azure.mgmt.storage.v2023_05_01.models import ( StorageAccountListKeysResult, ) from pytest import fixture