From 44972d1f4699f3a9181fdefcea0fa69caee20f6c Mon Sep 17 00:00:00 2001 From: Aigerim Beishenbekova Date: Thu, 6 Jan 2022 13:33:29 +0600 Subject: [PATCH 1/8] excluded pypy3 tests run to avoid pipeline failure due to dropping support 2.7/3.6 --- sdk/communication/azure-communication-identity/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/communication/azure-communication-identity/tests.yml b/sdk/communication/azure-communication-identity/tests.yml index 72061d127ed8..5c26e55327b8 100644 --- a/sdk/communication/azure-communication-identity/tests.yml +++ b/sdk/communication/azure-communication-identity/tests.yml @@ -8,6 +8,8 @@ stages: ServiceDirectory: communication MatrixReplace: - TestSamples=.*/true + MatrixFilters: + - PythonVersion=^(?!pypy3).* CloudConfig: Public: SubscriptionConfigurations: From b4ae89366da35825bd8a1d906ef5a33e37d2b64f Mon Sep 17 00:00:00 2001 From: Aigerim Beishenbekova Date: Thu, 6 Jan 2022 15:30:14 +0600 Subject: [PATCH 2/8] msrest version fixed for sms&phonenumber packages --- sdk/communication/azure-communication-phonenumbers/setup.py | 2 +- sdk/communication/azure-communication-sms/setup.py | 2 +- shared_requirements.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/setup.py b/sdk/communication/azure-communication-phonenumbers/setup.py index cdc932ae67b3..d2d8eed05170 100644 --- a/sdk/communication/azure-communication-phonenumbers/setup.py +++ b/sdk/communication/azure-communication-phonenumbers/setup.py @@ -61,7 +61,7 @@ 'azure.communication' ]), install_requires=[ - "msrest>=0.6.0", + "msrest>=0.6.21", 'azure-core<2.0.0,>=1.11.0', ], extras_require={ diff --git a/sdk/communication/azure-communication-sms/setup.py b/sdk/communication/azure-communication-sms/setup.py index c2d30fee2991..44944226308d 100644 --- a/sdk/communication/azure-communication-sms/setup.py +++ b/sdk/communication/azure-communication-sms/setup.py @@ -62,7 +62,7 @@ ]), install_requires=[ 'azure-core<2.0.0,>=1.11.0', - 'msrest>=0.6.0', + 'msrest>=0.6.21', 'six>=1.11.0' ], extras_require={ diff --git a/shared_requirements.txt b/shared_requirements.txt index b5c8b4fc5a4b..ce0ce3cc8ea4 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -189,8 +189,8 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0 #override azure-eventgrid azure-core<2.0.0,>=1.18.0 #override azure-monitor-query msrest>=0.6.19 #override azure-monitor-query azure-core<2.0.0,>=1.12.0 -#override azure-communication-sms msrest>=0.6.0 -#override azure-communication-phonenumbers msrest>=0.6.0 +#override azure-communication-sms msrest>=0.6.21 +#override azure-communication-phonenumbers msrest>=0.6.21 #override azure-communication-chat azure-core<2.0.0,>=1.19.1 #override azure-communication-sms azure-core<2.0.0,>=1.11.0 #override azure-communication-phonenumbers azure-core<2.0.0,>=1.11.0 From 801d1ea4a6790ff3e4853b07e15fc90a215df155 Mon Sep 17 00:00:00 2001 From: Aigerim Beishenbekova Date: Thu, 6 Jan 2022 16:14:54 +0600 Subject: [PATCH 3/8] azure-mgmt-core version fixed for azure-mgmt-communication package --- sdk/communication/azure-mgmt-communication/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/communication/azure-mgmt-communication/setup.py b/sdk/communication/azure-mgmt-communication/setup.py index e2117a481c59..991c2f8b56ca 100644 --- a/sdk/communication/azure-mgmt-communication/setup.py +++ b/sdk/communication/azure-mgmt-communication/setup.py @@ -67,7 +67,7 @@ install_requires=[ 'msrest>=0.6.21', 'azure-common~=1.1', - 'azure-mgmt-core>=1.2.0,<2.0.0', + 'azure-mgmt-core>=1.3.0,<2.0.0', ], python_requires=">=3.7", ) From 28b35cc67c56addb2a84db4f85db2f5f537e94f4 Mon Sep 17 00:00:00 2001 From: Aigerim Beishenbekova Date: Thu, 6 Jan 2022 16:58:39 +0600 Subject: [PATCH 4/8] analyzing task fail fix --- sdk/communication/ci.yml | 2 ++ shared_requirements.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/sdk/communication/ci.yml b/sdk/communication/ci.yml index 40619c505859..1621432f286a 100644 --- a/sdk/communication/ci.yml +++ b/sdk/communication/ci.yml @@ -30,6 +30,8 @@ extends: template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml parameters: ServiceDirectory: communication + MatrixFilters: + - PythonVersion=^(?!pypy3).* Artifacts: - name: azure-communication-identity safeName: azurecommunicationidentity diff --git a/shared_requirements.txt b/shared_requirements.txt index ce0ce3cc8ea4..e3157190dfd6 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -197,6 +197,7 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0 #override azure-communication-identity azure-core<2.0.0,>=1.19.1 #override azure-communication-networktraversal azure-core<2.0.0,>=1.19.1 #override azure-mgmt-communication azure-core<2.0.0,>=1.9.0 +#override azure-mgmt-communication azure-mgmt-core>=1.3.0,<2.0.0 #override azure-ai-metricsadvisor azure-core<2.0.0,>=1.6.0 #override azure-ai-translation-document azure-core<2.0.0,>=1.14.0 #override azure-monitor-opentelemetry-exporter azure-core<2.0.0,>=1.6.0 From 1befcc97dd892f969aed26f2f89d10b7c919fadf Mon Sep 17 00:00:00 2001 From: Aigerim Beishenbekova Date: Thu, 6 Jan 2022 18:34:27 +0600 Subject: [PATCH 5/8] excluded 2.7/3.6 tests run to avoid pipeline failure due to dropping support 2.7/3.6 --- sdk/communication/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/communication/ci.yml b/sdk/communication/ci.yml index 1621432f286a..4e46e4b69fd7 100644 --- a/sdk/communication/ci.yml +++ b/sdk/communication/ci.yml @@ -31,7 +31,7 @@ extends: parameters: ServiceDirectory: communication MatrixFilters: - - PythonVersion=^(?!pypy3).* + - PythonVersion=^(?!pypy3|2.7|3.6).* Artifacts: - name: azure-communication-identity safeName: azurecommunicationidentity From ac4e243df62ab3493a53596ca19938a91bf9dc4b Mon Sep 17 00:00:00 2001 From: Aigerim Beishenbekova Date: Thu, 6 Jan 2022 19:04:02 +0600 Subject: [PATCH 6/8] removed unneccessary config from test.yml --- sdk/communication/azure-communication-identity/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk/communication/azure-communication-identity/tests.yml b/sdk/communication/azure-communication-identity/tests.yml index 5c26e55327b8..72061d127ed8 100644 --- a/sdk/communication/azure-communication-identity/tests.yml +++ b/sdk/communication/azure-communication-identity/tests.yml @@ -8,8 +8,6 @@ stages: ServiceDirectory: communication MatrixReplace: - TestSamples=.*/true - MatrixFilters: - - PythonVersion=^(?!pypy3).* CloudConfig: Public: SubscriptionConfigurations: From 319add94f8a0be92c941394012845b721e9ad950 Mon Sep 17 00:00:00 2001 From: Aigerim Beishenbekova Date: Thu, 6 Jan 2022 20:16:13 +0600 Subject: [PATCH 7/8] azure-mgmt-core version reverted for azure-mgmt-communication --- shared_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared_requirements.txt b/shared_requirements.txt index e3157190dfd6..18fe6ab75602 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -197,7 +197,7 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0 #override azure-communication-identity azure-core<2.0.0,>=1.19.1 #override azure-communication-networktraversal azure-core<2.0.0,>=1.19.1 #override azure-mgmt-communication azure-core<2.0.0,>=1.9.0 -#override azure-mgmt-communication azure-mgmt-core>=1.3.0,<2.0.0 +#override azure-mgmt-communication azure-mgmt-core>=1.2.0,<2.0.0 #override azure-ai-metricsadvisor azure-core<2.0.0,>=1.6.0 #override azure-ai-translation-document azure-core<2.0.0,>=1.14.0 #override azure-monitor-opentelemetry-exporter azure-core<2.0.0,>=1.6.0 From 0af8ccd945019a8a9ab89a3931448e7f50dcda8d Mon Sep 17 00:00:00 2001 From: Aigerim Date: Thu, 6 Jan 2022 20:18:11 +0600 Subject: [PATCH 8/8] fixed dependency conflicts --- .../azure-communication-phonenumbers/setup.py | 2 +- sdk/communication/azure-communication-sms/setup.py | 2 +- sdk/identity/azure-identity/setup.py | 2 +- shared_requirements.txt | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/setup.py b/sdk/communication/azure-communication-phonenumbers/setup.py index d2d8eed05170..bd20acf79b37 100644 --- a/sdk/communication/azure-communication-phonenumbers/setup.py +++ b/sdk/communication/azure-communication-phonenumbers/setup.py @@ -62,7 +62,7 @@ ]), install_requires=[ "msrest>=0.6.21", - 'azure-core<2.0.0,>=1.11.0', + 'azure-core<2.0.0,>=1.15.0', ], extras_require={ ":python_version<'3.0'": ['azure-communication-nspkg'], diff --git a/sdk/communication/azure-communication-sms/setup.py b/sdk/communication/azure-communication-sms/setup.py index 44944226308d..028bc8a9b626 100644 --- a/sdk/communication/azure-communication-sms/setup.py +++ b/sdk/communication/azure-communication-sms/setup.py @@ -61,7 +61,7 @@ 'azure.communication' ]), install_requires=[ - 'azure-core<2.0.0,>=1.11.0', + 'azure-core<2.0.0,>=1.15.0', 'msrest>=0.6.21', 'six>=1.11.0' ], diff --git a/sdk/identity/azure-identity/setup.py b/sdk/identity/azure-identity/setup.py index 3509a0780fba..2720e6b72edb 100644 --- a/sdk/identity/azure-identity/setup.py +++ b/sdk/identity/azure-identity/setup.py @@ -73,7 +73,7 @@ ] ), install_requires=[ - "azure-core<2.0.0,>=1.11.0", + "azure-core<2.0.0,>=1.15.0", "cryptography>=2.5", "msal<2.0.0,>=1.12.0", "msal-extensions~=0.3.0", diff --git a/shared_requirements.txt b/shared_requirements.txt index 18fe6ab75602..785046021c99 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -138,7 +138,7 @@ chardet<5,>=3.0.2 #override azure-cosmos azure-core<2.0.0,>=1.0.0 #override azure-data-tables azure-core<2.0.0,>=1.14.0 #override azure-eventhub azure-core<2.0.0,>=1.14.0 -#override azure-identity azure-core<2.0.0,>=1.11.0 +#override azure-identity azure-core<2.0.0,>=1.15.0 #override azure-keyvault-administration azure-core<2.0.0,>=1.15.0 #override azure-keyvault-certificates azure-core<2.0.0,>=1.15.0 #override azure-keyvault-keys azure-core<2.0.0,>=1.15.0 @@ -192,12 +192,12 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0 #override azure-communication-sms msrest>=0.6.21 #override azure-communication-phonenumbers msrest>=0.6.21 #override azure-communication-chat azure-core<2.0.0,>=1.19.1 -#override azure-communication-sms azure-core<2.0.0,>=1.11.0 -#override azure-communication-phonenumbers azure-core<2.0.0,>=1.11.0 +#override azure-communication-sms azure-core<2.0.0,>=1.15.0 +#override azure-communication-phonenumbers azure-core<2.0.0,>=1.15.0 #override azure-communication-identity azure-core<2.0.0,>=1.19.1 #override azure-communication-networktraversal azure-core<2.0.0,>=1.19.1 #override azure-mgmt-communication azure-core<2.0.0,>=1.9.0 -#override azure-mgmt-communication azure-mgmt-core>=1.2.0,<2.0.0 +#override azure-mgmt-communication azure-mgmt-core>=1.3.0,<2.0.0 #override azure-ai-metricsadvisor azure-core<2.0.0,>=1.6.0 #override azure-ai-translation-document azure-core<2.0.0,>=1.14.0 #override azure-monitor-opentelemetry-exporter azure-core<2.0.0,>=1.6.0