From 4f990fe949177e15794384d9e5caeab16aa5b321 Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 10:14:39 +0200 Subject: [PATCH 01/15] Replace == with ~= where applicable. --- src/azure-cli/setup.py | 80 +++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 03a9ca77aa9..59516802523 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -55,75 +55,75 @@ 'azure-batch~=15.0.0b1', 'azure-cli-core=={}'.format(VERSION), 'azure-cosmos~=3.0,>=3.0.2', - 'azure-data-tables==12.4.0', + 'azure-data-tables~=12.4.0', 'azure-datalake-store~=1.0.0a0', - 'azure-keyvault-administration==4.4.0b2', - 'azure-keyvault-certificates==4.7.0', - 'azure-keyvault-keys==4.11.0b1', - 'azure-keyvault-secrets==4.7.0', - 'azure-mgmt-advisor==9.0.0', - 'azure-mgmt-apimanagement==4.0.0', - 'azure-mgmt-appconfiguration==3.1.0', - 'azure-mgmt-appcontainers==2.0.0', + 'azure-keyvault-administration~=4.4.0b2', + 'azure-keyvault-certificates~=4.7.0', + 'azure-keyvault-keys~=4.11.0b1', + 'azure-keyvault-secrets~=4.7.0', + 'azure-mgmt-advisor~=9.0.0', + 'azure-mgmt-apimanagement~=4.0.0', + 'azure-mgmt-appconfiguration~=3.1.0', + 'azure-mgmt-appcontainers~=2.0.0', 'azure-mgmt-applicationinsights~=1.0.0', 'azure-mgmt-authorization~=4.0.0', - 'azure-mgmt-batchai==7.0.0b1', + 'azure-mgmt-batchai~=7.0.0b1', 'azure-mgmt-batch~=17.3.0', - 'azure-mgmt-billing==6.0.0', + 'azure-mgmt-billing~=6.0.0', 'azure-mgmt-botservice~=2.0.0b3', - 'azure-mgmt-cdn==12.0.0', + 'azure-mgmt-cdn~=12.0.0', 'azure-mgmt-cognitiveservices~=13.5.0', 'azure-mgmt-compute~=34.1.0', - 'azure-mgmt-containerinstance==10.2.0b1', - 'azure-mgmt-containerregistry==14.0.0', + 'azure-mgmt-containerinstance~=10.2.0b1', + 'azure-mgmt-containerregistry~=14.0.0', 'azure-mgmt-containerservice~=36.0.0', - 'azure-mgmt-cosmosdb==9.7.0', + 'azure-mgmt-cosmosdb~=9.7.0', 'azure-mgmt-databoxedge~=1.0.0', 'azure-mgmt-datalake-store~=1.1.0b1', 'azure-mgmt-datamigration~=10.0.0', 'azure-mgmt-dns~=8.0.0', - 'azure-mgmt-eventgrid==10.2.0b2', + 'azure-mgmt-eventgrid~=10.2.0b2', 'azure-mgmt-eventhub~=10.1.0', - 'azure-mgmt-extendedlocation==1.0.0b2', - 'azure-mgmt-hdinsight==9.0.0b3', + 'azure-mgmt-extendedlocation~=1.0.0b2', + 'azure-mgmt-hdinsight~=9.0.0b3', 'azure-mgmt-imagebuilder~=1.3.0', 'azure-mgmt-iotcentral~=10.0.0b1', - 'azure-mgmt-iothub==3.0.0', - 'azure-mgmt-iothubprovisioningservices==1.1.0', - 'azure-mgmt-keyvault==11.0.0', - 'azure-mgmt-loganalytics==13.0.0b4', + 'azure-mgmt-iothub~=3.0.0', + 'azure-mgmt-iothubprovisioningservices~=1.1.0', + 'azure-mgmt-keyvault~=11.0.0', + 'azure-mgmt-loganalytics~=13.0.0b4', 'azure-mgmt-managementgroups~=1.0.0', 'azure-mgmt-maps~=2.0.0', - 'azure-mgmt-marketplaceordering==1.1.0', + 'azure-mgmt-marketplaceordering~=1.1.0', 'azure-mgmt-media~=9.0', 'azure-mgmt-monitor~=7.0.0b1', 'azure-mgmt-msi~=7.0.0', 'azure-mgmt-netapp~=10.1.0', - 'azure-mgmt-policyinsights==1.1.0b4', - 'azure-mgmt-postgresqlflexibleservers==1.1.0b2', + 'azure-mgmt-policyinsights~=1.1.0b4', + 'azure-mgmt-postgresqlflexibleservers~=1.1.0b2', 'azure-mgmt-privatedns~=1.0.0', - 'azure-mgmt-rdbms==10.2.0b17', - 'azure-mgmt-mysqlflexibleservers==1.0.0b3', + 'azure-mgmt-rdbms~=10.2.0b17', + 'azure-mgmt-mysqlflexibleservers~=1.0.0b3', 'azure-mgmt-recoveryservicesbackup~=9.2.0', 'azure-mgmt-recoveryservices~=3.0.0', 'azure-mgmt-redhatopenshift~=1.5.0', 'azure-mgmt-redis~=14.5.0', - 'azure-mgmt-resource==23.3.0', + 'azure-mgmt-resource~=23.3.0', 'azure-mgmt-search~=9.0', - 'azure-mgmt-security==6.0.0', + 'azure-mgmt-security~=6.0.0', 'azure-mgmt-servicebus~=8.2.0', - 'azure-mgmt-servicefabricmanagedclusters==2.1.0b1', - 'azure-mgmt-servicelinker==1.2.0b3', + 'azure-mgmt-servicefabricmanagedclusters~=2.1.0b1', + 'azure-mgmt-servicelinker~=1.2.0b3', 'azure-mgmt-servicefabric~=2.1.0', - 'azure-mgmt-signalr==2.0.0b2', - 'azure-mgmt-sqlvirtualmachine==1.0.0b5', - 'azure-mgmt-sql==4.0.0b21', - 'azure-mgmt-storage==22.1.0', - 'azure-mgmt-synapse==2.1.0b5', + 'azure-mgmt-signalr~=2.0.0b2', + 'azure-mgmt-sqlvirtualmachine~=1.0.0b5', + 'azure-mgmt-sql~=4.0.0b21', + 'azure-mgmt-storage~=22.1.0', + 'azure-mgmt-synapse~=2.1.0b5', 'azure-mgmt-trafficmanager~=1.0.0', - 'azure-mgmt-web==7.3.1', - 'azure-monitor-query==1.2.0', - 'azure-multiapi-storage==1.4.0', + 'azure-mgmt-web~=7.3.1', + 'azure-monitor-query~=1.2.0', + 'azure-multiapi-storage~=1.4.0', 'azure-storage-common~=1.4', 'azure-synapse-accesscontrol~=0.5.0', 'azure-synapse-artifacts~=0.20.0', @@ -142,7 +142,7 @@ 'PyGithub~=1.38', 'PyNaCl~=1.5.0', 'scp~=0.13.2', - 'semver==2.13.0', + 'semver~=2.13.0', 'setuptools', 'six>=1.10.0', # six is still used by countless extensions 'sshtunnel~=0.1.4', From f4c561ab14652329fe6b4de1cb8112e36acf1c31 Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 10:16:31 +0200 Subject: [PATCH 02/15] Remove b2 suffix from azure-keyvault-administration range. --- src/azure-cli/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 59516802523..f1674dab13b 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -57,7 +57,7 @@ 'azure-cosmos~=3.0,>=3.0.2', 'azure-data-tables~=12.4.0', 'azure-datalake-store~=1.0.0a0', - 'azure-keyvault-administration~=4.4.0b2', + 'azure-keyvault-administration~=4.4.0', 'azure-keyvault-certificates~=4.7.0', 'azure-keyvault-keys~=4.11.0b1', 'azure-keyvault-secrets~=4.7.0', From 00ea6dcea6d3e60fb2dc59f021ec8f2335c34a32 Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 10:20:11 +0200 Subject: [PATCH 03/15] Remove b suffix from azure-mgmt-batchai. --- src/azure-cli/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index f1674dab13b..1f28190daa6 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -67,7 +67,7 @@ 'azure-mgmt-appcontainers~=2.0.0', 'azure-mgmt-applicationinsights~=1.0.0', 'azure-mgmt-authorization~=4.0.0', - 'azure-mgmt-batchai~=7.0.0b1', + 'azure-mgmt-batchai~=7.0.0', 'azure-mgmt-batch~=17.3.0', 'azure-mgmt-billing~=6.0.0', 'azure-mgmt-botservice~=2.0.0b3', From 48d726da0578d427b40091f4636adc7ae80a381a Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 10:22:31 +0200 Subject: [PATCH 04/15] Remove b suffix from azure-mgmt-eventgrid. --- src/azure-cli/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 1f28190daa6..65176afed55 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -82,7 +82,7 @@ 'azure-mgmt-datalake-store~=1.1.0b1', 'azure-mgmt-datamigration~=10.0.0', 'azure-mgmt-dns~=8.0.0', - 'azure-mgmt-eventgrid~=10.2.0b2', + 'azure-mgmt-eventgrid~=10.2.0', 'azure-mgmt-eventhub~=10.1.0', 'azure-mgmt-extendedlocation~=1.0.0b2', 'azure-mgmt-hdinsight~=9.0.0b3', From 4ff40770eea997054119bdbf2275906bde8a9dbe Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Tue, 20 May 2025 10:23:32 +0200 Subject: [PATCH 05/15] Update src/azure-cli/setup.py --- src/azure-cli/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 65176afed55..9c2880868ba 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -84,7 +84,7 @@ 'azure-mgmt-dns~=8.0.0', 'azure-mgmt-eventgrid~=10.2.0', 'azure-mgmt-eventhub~=10.1.0', - 'azure-mgmt-extendedlocation~=1.0.0b2', + 'azure-mgmt-extendedlocation~=1.0.0', 'azure-mgmt-hdinsight~=9.0.0b3', 'azure-mgmt-imagebuilder~=1.3.0', 'azure-mgmt-iotcentral~=10.0.0b1', From d0815aa9764e65d8e810c2e1adcba564a8e7a10d Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Tue, 20 May 2025 10:24:22 +0200 Subject: [PATCH 06/15] Update src/azure-cli/setup.py --- src/azure-cli/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 9c2880868ba..1629c7e3b70 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -85,7 +85,7 @@ 'azure-mgmt-eventgrid~=10.2.0', 'azure-mgmt-eventhub~=10.1.0', 'azure-mgmt-extendedlocation~=1.0.0', - 'azure-mgmt-hdinsight~=9.0.0b3', + 'azure-mgmt-hdinsight~=9.0.0', 'azure-mgmt-imagebuilder~=1.3.0', 'azure-mgmt-iotcentral~=10.0.0b1', 'azure-mgmt-iothub~=3.0.0', From 243259b8b09d65a4a9e366e62cac4728891eb1a8 Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Tue, 20 May 2025 10:26:23 +0200 Subject: [PATCH 07/15] Update src/azure-cli/setup.py --- src/azure-cli/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 1629c7e3b70..a22dc4d2fec 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -100,7 +100,7 @@ 'azure-mgmt-msi~=7.0.0', 'azure-mgmt-netapp~=10.1.0', 'azure-mgmt-policyinsights~=1.1.0b4', - 'azure-mgmt-postgresqlflexibleservers~=1.1.0b2', + 'azure-mgmt-postgresqlflexibleservers~=1.1.0', 'azure-mgmt-privatedns~=1.0.0', 'azure-mgmt-rdbms~=10.2.0b17', 'azure-mgmt-mysqlflexibleservers~=1.0.0b3', From 4a7b75888f39ed3ed8a2d7a60bbf9f02eec0c594 Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 10:33:02 +0200 Subject: [PATCH 08/15] Remove b suffix from azure-mgmt-botservice. --- src/azure-cli/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index a22dc4d2fec..0d1e1f556b9 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -70,7 +70,7 @@ 'azure-mgmt-batchai~=7.0.0', 'azure-mgmt-batch~=17.3.0', 'azure-mgmt-billing~=6.0.0', - 'azure-mgmt-botservice~=2.0.0b3', + 'azure-mgmt-botservice~=2.0.0', 'azure-mgmt-cdn~=12.0.0', 'azure-mgmt-cognitiveservices~=13.5.0', 'azure-mgmt-compute~=34.1.0', From 4bc046b6aed14d050a62b17cc50e8f50103d2feb Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 10:36:10 +0200 Subject: [PATCH 09/15] Pin semver again. --- src/azure-cli/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 0d1e1f556b9..6ac52ad9497 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -142,7 +142,7 @@ 'PyGithub~=1.38', 'PyNaCl~=1.5.0', 'scp~=0.13.2', - 'semver~=2.13.0', + 'semver==2.13.0', 'setuptools', 'six>=1.10.0', # six is still used by countless extensions 'sshtunnel~=0.1.4', From a04c42e1c709ab34943c0f3a4ab9dac5a6908861 Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 10:52:50 +0200 Subject: [PATCH 10/15] Update requirements files. --- src/azure-cli/requirements.py3.Darwin.txt | 14 +++++++------- src/azure-cli/requirements.py3.Linux.txt | 14 +++++++------- src/azure-cli/requirements.py3.windows.txt | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index f57d8a3ff33..da6f218ddaf 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -12,7 +12,7 @@ azure-core==1.31.0 azure-cosmos==3.2.0 azure-data-tables==12.4.0 azure-datalake-store==1.0.0a0 -azure-keyvault-administration==4.4.0b2 +azure-keyvault-administration==4.4.0 azure-keyvault-certificates==4.7.0 azure-keyvault-keys==4.11.0b1 azure-keyvault-secrets==4.7.0 @@ -23,9 +23,9 @@ azure-mgmt-appcontainers==2.0.0 azure-mgmt-applicationinsights==1.0.0 azure-mgmt-authorization==4.0.0 azure-mgmt-batch==17.3.0 -azure-mgmt-batchai==7.0.0b1 +azure-mgmt-batchai==7.0.0 azure-mgmt-billing==6.0.0 -azure-mgmt-botservice==2.0.0b3 +azure-mgmt-botservice==2.0.0 azure-mgmt-cdn==12.0.0 azure-mgmt-cognitiveservices==13.5.0 azure-mgmt-compute==34.1.0 @@ -39,10 +39,10 @@ azure-mgmt-datalake-nspkg==3.0.1 azure-mgmt-datalake-store==1.1.0b1 azure-mgmt-datamigration==10.0.0 azure-mgmt-dns==8.0.0 -azure-mgmt-eventgrid==10.2.0b2 +azure-mgmt-eventgrid==10.2.0 azure-mgmt-eventhub==10.1.0 -azure-mgmt-extendedlocation==1.0.0b2 -azure-mgmt-hdinsight==9.0.0b3 +azure-mgmt-extendedlocation==1.0.0 +azure-mgmt-hdinsight==9.0.0 azure-mgmt-imagebuilder==1.3.0 azure-mgmt-iotcentral==10.0.0b1 azure-mgmt-iothub==3.0.0 @@ -57,7 +57,7 @@ azure-mgmt-monitor==7.0.0b1 azure-mgmt-msi==7.0.0 azure-mgmt-netapp==10.1.0 azure-mgmt-policyinsights==1.1.0b4 -azure-mgmt-postgresqlflexibleservers==1.1.0b2 +azure-mgmt-postgresqlflexibleservers==1.1.0 azure-mgmt-privatedns==1.0.0 azure-mgmt-rdbms==10.2.0b17 azure-mgmt-mysqlflexibleservers==1.0.0b3 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 0c47ca177a2..4674787adfc 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -12,7 +12,7 @@ azure-core==1.31.0 azure-cosmos==3.2.0 azure-data-tables==12.4.0 azure-datalake-store==1.0.0a0 -azure-keyvault-administration==4.4.0b2 +azure-keyvault-administration==4.4.0 azure-keyvault-certificates==4.7.0 azure-keyvault-keys==4.11.0b1 azure-keyvault-secrets==4.7.0 @@ -23,9 +23,9 @@ azure-mgmt-appcontainers==2.0.0 azure-mgmt-applicationinsights==1.0.0 azure-mgmt-authorization==4.0.0 azure-mgmt-batch==17.3.0 -azure-mgmt-batchai==7.0.0b1 +azure-mgmt-batchai==7.0.0 azure-mgmt-billing==6.0.0 -azure-mgmt-botservice==2.0.0b3 +azure-mgmt-botservice==2.0.0 azure-mgmt-cdn==12.0.0 azure-mgmt-cognitiveservices==13.5.0 azure-mgmt-compute==34.1.0 @@ -39,10 +39,10 @@ azure-mgmt-datalake-nspkg==3.0.1 azure-mgmt-datalake-store==1.1.0b1 azure-mgmt-datamigration==10.0.0 azure-mgmt-dns==8.0.0 -azure-mgmt-eventgrid==10.2.0b2 +azure-mgmt-eventgrid==10.2.0 azure-mgmt-eventhub==10.1.0 -azure-mgmt-extendedlocation==1.0.0b2 -azure-mgmt-hdinsight==9.0.0b3 +azure-mgmt-extendedlocation==1.0.0 +azure-mgmt-hdinsight==9.0.0 azure-mgmt-imagebuilder==1.3.0 azure-mgmt-iotcentral==10.0.0b1 azure-mgmt-iothub==3.0.0 @@ -57,7 +57,7 @@ azure-mgmt-monitor==7.0.0b1 azure-mgmt-msi==7.0.0 azure-mgmt-netapp==10.1.0 azure-mgmt-policyinsights==1.1.0b4 -azure-mgmt-postgresqlflexibleservers==1.1.0b2 +azure-mgmt-postgresqlflexibleservers==1.1.0 azure-mgmt-privatedns==1.0.0 azure-mgmt-rdbms==10.2.0b17 azure-mgmt-mysqlflexibleservers==1.0.0b3 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 4811a80c927..eeb22742718 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -12,7 +12,7 @@ azure-core==1.31.0 azure-cosmos==3.2.0 azure-data-tables==12.4.0 azure-datalake-store==1.0.0a0 -azure-keyvault-administration==4.4.0b2 +azure-keyvault-administration==4.4.0 azure-keyvault-certificates==4.7.0 azure-keyvault-keys==4.11.0b1 azure-keyvault-secrets==4.7.0 @@ -23,9 +23,9 @@ azure-mgmt-appcontainers==2.0.0 azure-mgmt-applicationinsights==1.0.0 azure-mgmt-authorization==4.0.0 azure-mgmt-batch==17.3.0 -azure-mgmt-batchai==7.0.0b1 +azure-mgmt-batchai==7.0.0 azure-mgmt-billing==6.0.0 -azure-mgmt-botservice==2.0.0b3 +azure-mgmt-botservice==2.0.0 azure-mgmt-cdn==12.0.0 azure-mgmt-cognitiveservices==13.5.0 azure-mgmt-compute==34.1.0 @@ -39,10 +39,10 @@ azure-mgmt-datalake-nspkg==3.0.1 azure-mgmt-datalake-store==1.1.0b1 azure-mgmt-datamigration==10.0.0 azure-mgmt-dns==8.0.0 -azure-mgmt-eventgrid==10.2.0b2 +azure-mgmt-eventgrid==10.2.0 azure-mgmt-eventhub==10.1.0 -azure-mgmt-extendedlocation==1.0.0b2 -azure-mgmt-hdinsight==9.0.0b3 +azure-mgmt-extendedlocation==1.0.0 +azure-mgmt-hdinsight==9.0.0 azure-mgmt-imagebuilder==1.3.0 azure-mgmt-iotcentral==10.0.0b1 azure-mgmt-iothub==3.0.0 @@ -57,7 +57,7 @@ azure-mgmt-monitor==7.0.0b1 azure-mgmt-msi==7.0.0 azure-mgmt-netapp==10.1.0 azure-mgmt-policyinsights==1.1.0b4 -azure-mgmt-postgresqlflexibleservers==1.1.0b2 +azure-mgmt-postgresqlflexibleservers==1.1.0 azure-mgmt-privatedns==1.0.0 azure-mgmt-rdbms==10.2.0b17 azure-mgmt-mysqlflexibleservers==1.0.0b3 From 322790e7ec91c5b9989c9eaa35ddc3f8a5590ce8 Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 11:47:55 +0200 Subject: [PATCH 11/15] Pin azure-mgmt-eventgrid. --- src/azure-cli/requirements.py3.Darwin.txt | 2 +- src/azure-cli/requirements.py3.Linux.txt | 2 +- src/azure-cli/requirements.py3.windows.txt | 2 +- src/azure-cli/setup.py | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index da6f218ddaf..6a0b9a3b8af 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -39,7 +39,7 @@ azure-mgmt-datalake-nspkg==3.0.1 azure-mgmt-datalake-store==1.1.0b1 azure-mgmt-datamigration==10.0.0 azure-mgmt-dns==8.0.0 -azure-mgmt-eventgrid==10.2.0 +azure-mgmt-eventgrid==10.2.0b2 azure-mgmt-eventhub==10.1.0 azure-mgmt-extendedlocation==1.0.0 azure-mgmt-hdinsight==9.0.0 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 4674787adfc..ea682c6f738 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -39,7 +39,7 @@ azure-mgmt-datalake-nspkg==3.0.1 azure-mgmt-datalake-store==1.1.0b1 azure-mgmt-datamigration==10.0.0 azure-mgmt-dns==8.0.0 -azure-mgmt-eventgrid==10.2.0 +azure-mgmt-eventgrid==10.2.0b2 azure-mgmt-eventhub==10.1.0 azure-mgmt-extendedlocation==1.0.0 azure-mgmt-hdinsight==9.0.0 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index eeb22742718..26dc538b774 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -39,7 +39,7 @@ azure-mgmt-datalake-nspkg==3.0.1 azure-mgmt-datalake-store==1.1.0b1 azure-mgmt-datamigration==10.0.0 azure-mgmt-dns==8.0.0 -azure-mgmt-eventgrid==10.2.0 +azure-mgmt-eventgrid==10.2.0b2 azure-mgmt-eventhub==10.1.0 azure-mgmt-extendedlocation==1.0.0 azure-mgmt-hdinsight==9.0.0 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 6ac52ad9497..6a9a2732fd9 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -82,7 +82,9 @@ 'azure-mgmt-datalake-store~=1.1.0b1', 'azure-mgmt-datamigration~=10.0.0', 'azure-mgmt-dns~=8.0.0', - 'azure-mgmt-eventgrid~=10.2.0', + # There are breaking changes between v10.2.0b2 and v10.2.0. For example: + # `ImportError: cannot import name 'ResourceSku' from 'azure.mgmt.eventgrid.models' (/home/runner/work/azure-cli/azure-cli/env/lib/python3.12/site-packages/azure/mgmt/eventgrid/models/__init__.py). Did you mean: 'Resource'?` + 'azure-mgmt-eventgrid==10.2.0b2', 'azure-mgmt-eventhub~=10.1.0', 'azure-mgmt-extendedlocation~=1.0.0', 'azure-mgmt-hdinsight~=9.0.0', From 7c5a87726672a35979667c22a26d13bcf6c36d57 Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 18:54:44 +0200 Subject: [PATCH 12/15] Pin azure-mgmt-hdinsight. --- src/azure-cli/requirements.py3.Darwin.txt | 2 +- src/azure-cli/requirements.py3.Linux.txt | 2 +- src/azure-cli/requirements.py3.windows.txt | 2 +- src/azure-cli/setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index 6a0b9a3b8af..eda8a1237ce 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -42,7 +42,7 @@ azure-mgmt-dns==8.0.0 azure-mgmt-eventgrid==10.2.0b2 azure-mgmt-eventhub==10.1.0 azure-mgmt-extendedlocation==1.0.0 -azure-mgmt-hdinsight==9.0.0 +azure-mgmt-hdinsight==9.0.0b3 azure-mgmt-imagebuilder==1.3.0 azure-mgmt-iotcentral==10.0.0b1 azure-mgmt-iothub==3.0.0 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index ea682c6f738..9d6cc4c6560 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -42,7 +42,7 @@ azure-mgmt-dns==8.0.0 azure-mgmt-eventgrid==10.2.0b2 azure-mgmt-eventhub==10.1.0 azure-mgmt-extendedlocation==1.0.0 -azure-mgmt-hdinsight==9.0.0 +azure-mgmt-hdinsight==9.0.0b3 azure-mgmt-imagebuilder==1.3.0 azure-mgmt-iotcentral==10.0.0b1 azure-mgmt-iothub==3.0.0 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 26dc538b774..465917fc0e0 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -42,7 +42,7 @@ azure-mgmt-dns==8.0.0 azure-mgmt-eventgrid==10.2.0b2 azure-mgmt-eventhub==10.1.0 azure-mgmt-extendedlocation==1.0.0 -azure-mgmt-hdinsight==9.0.0 +azure-mgmt-hdinsight==9.0.0b3 azure-mgmt-imagebuilder==1.3.0 azure-mgmt-iotcentral==10.0.0b1 azure-mgmt-iothub==3.0.0 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 6a9a2732fd9..dbda80ce5a2 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -87,7 +87,7 @@ 'azure-mgmt-eventgrid==10.2.0b2', 'azure-mgmt-eventhub~=10.1.0', 'azure-mgmt-extendedlocation~=1.0.0', - 'azure-mgmt-hdinsight~=9.0.0', + 'azure-mgmt-hdinsight==9.0.0b3', 'azure-mgmt-imagebuilder~=1.3.0', 'azure-mgmt-iotcentral~=10.0.0b1', 'azure-mgmt-iothub~=3.0.0', From 816299e95036b7bcc2124738ae303bc3da0e8e65 Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 19:11:58 +0200 Subject: [PATCH 13/15] Add comment explaining pin. --- src/azure-cli/setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index dbda80ce5a2..9590ce03f7c 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -87,6 +87,8 @@ 'azure-mgmt-eventgrid==10.2.0b2', 'azure-mgmt-eventhub~=10.1.0', 'azure-mgmt-extendedlocation~=1.0.0', + # There are breaking changes between v9.0.0b3 and v9.0.0. For example: + # `AttributeError: type object 'ExtensionsOperations' has no attribute 'get_azure_monitor_agent_status'. Did you mean: 'get_azure_monitor_status'?` 'azure-mgmt-hdinsight==9.0.0b3', 'azure-mgmt-imagebuilder~=1.3.0', 'azure-mgmt-iotcentral~=10.0.0b1', From 714ebb09422c5172e370c19686a594cd77fae7df Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Tue, 20 May 2025 20:25:20 +0200 Subject: [PATCH 14/15] Add comment and satisfy flake8. --- src/azure-cli/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 9590ce03f7c..41a756faed2 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -82,7 +82,7 @@ 'azure-mgmt-datalake-store~=1.1.0b1', 'azure-mgmt-datamigration~=10.0.0', 'azure-mgmt-dns~=8.0.0', - # There are breaking changes between v10.2.0b2 and v10.2.0. For example: + # There are breaking changes between v10.2.0b2 and v10.2.0. For example: # `ImportError: cannot import name 'ResourceSku' from 'azure.mgmt.eventgrid.models' (/home/runner/work/azure-cli/azure-cli/env/lib/python3.12/site-packages/azure/mgmt/eventgrid/models/__init__.py). Did you mean: 'Resource'?` 'azure-mgmt-eventgrid==10.2.0b2', 'azure-mgmt-eventhub~=10.1.0', From 46efbefaec3216f5e3a33a0edebc0a5752f83587 Mon Sep 17 00:00:00 2001 From: Jan Jagusch Date: Wed, 21 May 2025 09:47:32 +0200 Subject: [PATCH 15/15] Add comments. --- src/azure-cli/setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 41a756faed2..07fffa167ca 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -84,11 +84,13 @@ 'azure-mgmt-dns~=8.0.0', # There are breaking changes between v10.2.0b2 and v10.2.0. For example: # `ImportError: cannot import name 'ResourceSku' from 'azure.mgmt.eventgrid.models' (/home/runner/work/azure-cli/azure-cli/env/lib/python3.12/site-packages/azure/mgmt/eventgrid/models/__init__.py). Did you mean: 'Resource'?` + # Ref.: https://github.com/Azure/azure-cli/issues/31520 'azure-mgmt-eventgrid==10.2.0b2', 'azure-mgmt-eventhub~=10.1.0', 'azure-mgmt-extendedlocation~=1.0.0', # There are breaking changes between v9.0.0b3 and v9.0.0. For example: # `AttributeError: type object 'ExtensionsOperations' has no attribute 'get_azure_monitor_agent_status'. Did you mean: 'get_azure_monitor_status'?` + # Ref.: https://github.com/Azure/azure-cli/issues/31521 'azure-mgmt-hdinsight==9.0.0b3', 'azure-mgmt-imagebuilder~=1.3.0', 'azure-mgmt-iotcentral~=10.0.0b1', @@ -146,6 +148,8 @@ 'PyGithub~=1.38', 'PyNaCl~=1.5.0', 'scp~=0.13.2', + # semver v2.13 was released in October 2020. Moving to v3 is strongly recommended. + # Ref.: https://github.com/Azure/azure-cli/issues/31519 'semver==2.13.0', 'setuptools', 'six>=1.10.0', # six is still used by countless extensions