Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python …

…into add_json_content * 'main' of https://github.com/Azure/azure-sdk-for-python: [QnA][CLU] Release prep (Azure#21518) Increment package version after release of azure-ai-textanalytics (Azure#21547)
iscai-msft · Nov 2, 2021 · ae6fc5e · ae6fc5e
2 parents c223e37 + 05c8dc8
commit ae6fc5e
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 15 deletions.
diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/CHANGELOG.md b/sdk/cognitivelanguage/azure-ai-language-conversations/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.0.0b1 (unreleased)
+## 1.0.0b1 (2021-11-03)
 
 ### Features Added
 * Initial release
diff --git a/...nguage-conversations/samples/async/sample_analyze_conversation_app_language_parm_async.py b/...nguage-conversations/samples/async/sample_analyze_conversation_app_language_parm_async.py
@@ -30,7 +30,7 @@ async def sample_analyze_conversation_app_language_parm_async():
     import os
     from azure.core.credentials import AzureKeyCredential
 
-    from azure.ai.language.conversations import ConversationAnalysisClient
+    from azure.ai.language.conversations.aio import ConversationAnalysisClient
     from azure.ai.language.conversations.models import ConversationAnalysisOptions
 
     # get secrets
@@ -48,7 +48,7 @@ async def sample_analyze_conversation_app_language_parm_async():
     # analyze quey
     client = ConversationAnalysisClient(conv_endpoint, AzureKeyCredential(conv_key))
     async with client:
-        result = client.analyze_conversations(
+        result = await client.analyze_conversations(
             input,
             project_name=conv_project,
             deployment_name='production'

diff --git a/...nversations/samples/async/sample_analyze_orchestration_app_conversation_response_async.py b/...nversations/samples/async/sample_analyze_orchestration_app_conversation_response_async.py
@@ -30,7 +30,7 @@ async def sample_analyze_orchestration_app_conversation_response_async():
     import os
     from azure.core.credentials import AzureKeyCredential
 
-    from azure.ai.language.conversations import ConversationAnalysisClient
+    from azure.ai.language.conversations.aio import ConversationAnalysisClient
     from azure.ai.language.conversations.models import ConversationAnalysisOptions
 
     # get secrets
@@ -47,7 +47,7 @@ async def sample_analyze_orchestration_app_conversation_response_async():
     # analyze query
     client = ConversationAnalysisClient(conv_endpoint, AzureKeyCredential(conv_key))
     async with client:
-        result = client.analyze_conversations(
+        result = await client.analyze_conversations(
             input,
             project_name=orchestration_project,
             deployment_name='production',

diff --git a/...guage-conversations/samples/async/sample_analyze_orchestration_app_luis_response_async.py b/...guage-conversations/samples/async/sample_analyze_orchestration_app_luis_response_async.py
@@ -30,7 +30,7 @@ async def sample_analyze_orchestration_app_luis_response_async():
     import os
     from azure.core.credentials import AzureKeyCredential
 
-    from azure.ai.language.conversations import ConversationAnalysisClient
+    from azure.ai.language.conversations.aio import ConversationAnalysisClient
     from azure.ai.language.conversations.models import ConversationAnalysisOptions
 
     # get secrets
@@ -47,7 +47,7 @@ async def sample_analyze_orchestration_app_luis_response_async():
     # analyze query
     client = ConversationAnalysisClient(conv_endpoint, AzureKeyCredential(conv_key))
     async with client:
-        result = client.analyze_conversations(
+        result = await client.analyze_conversations(
             input,
             project_name=orchestration_project,
             deployment_name='production',

diff --git a/...nguage-conversations/samples/async/sample_analyze_orchestration_app_qna_response_async.py b/...nguage-conversations/samples/async/sample_analyze_orchestration_app_qna_response_async.py
@@ -30,7 +30,7 @@ async def sample_analyze_orchestration_app_qna_response_async():
     import os
     from azure.core.credentials import AzureKeyCredential
 
-    from azure.ai.language.conversations import ConversationAnalysisClient
+    from azure.ai.language.conversations.aio import ConversationAnalysisClient
     from azure.ai.language.conversations.models import ConversationAnalysisOptions
 
     # get secrets
@@ -47,7 +47,7 @@ async def sample_analyze_orchestration_app_qna_response_async():
     # analyze query
     client = ConversationAnalysisClient(conv_endpoint, AzureKeyCredential(conv_key))
     async with client:
-        result = client.analyze_conversations(
+        result = await client.analyze_conversations(
             input,
             project_name=orchestration_project,
             deployment_name='production',

diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/setup.py b/sdk/cognitivelanguage/azure-ai-language-conversations/setup.py
@@ -76,11 +76,15 @@
     packages=find_packages(exclude=[
         'tests',
         # Exclude packages that will be covered by PEP420 or nspkg
+        # This means any folder structure that only consists of a __init__.py.
+        # For example, for storage, this would mean adding 'azure.storage'
+        # in addition to the default 'azure' that is seen here.
+        'azure',
         'azure.ai',
         'azure.ai.language',
     ]),
     install_requires=[
-        "azure-core<2.0.0,>=1.19.0",
+        "azure-core<2.0.0,>=1.19.1",
         "msrest>=0.6.21",
         'azure-common~=1.1',
         'six>=1.11.0',

diff --git a/sdk/cognitivelanguage/azure-ai-language-questionanswering/CHANGELOG.md b/sdk/cognitivelanguage/azure-ai-language-questionanswering/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.0.0 (Unreleased)
+## 1.0.0 (2021-11-03)
 
 * We are now targeting service version `2021-10-01`
 

diff --git a/sdk/cognitivelanguage/azure-ai-language-questionanswering/setup.py b/sdk/cognitivelanguage/azure-ai-language-questionanswering/setup.py
@@ -67,7 +67,7 @@
         'azure.ai.language',
     ]),
     install_requires=[
-        'azure-core<2.0.0,>=1.19.0',
+        'azure-core<2.0.0,>=1.19.1',
         'msrest>=0.6.21',
     ],
     extras_require={

diff --git a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Release History
 
+## 5.2.0b3 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+### Other Changes
+
 ## 5.2.0b2 (2021-11-02)
 
 This version of the SDK defaults to the latest supported API version, which currently is `v3.2-preview.2`.

diff --git a/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_version.py b/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_version.py
@@ -4,5 +4,5 @@
 # Licensed under the MIT License.
 # ------------------------------------
 
-VERSION = "5.2.0b2"
+VERSION = "5.2.0b3"
 DEFAULT_API_VERSION = "v3.2-preview.2"
diff --git a/shared_requirements.txt b/shared_requirements.txt
@@ -151,7 +151,7 @@ backports.functools-lru-cache >= 1.6.4; python_version == "2.7"
 #override azure-keyvault-secrets azure-core<2.0.0,>=1.7.0
 #override azure-ai-textanalytics msrest>=0.6.21
 #override azure-ai-textanalytics azure-core<2.0.0,>=1.19.1
-#override azure-ai-language-questionanswering azure-core<2.0.0,>=1.19.0
+#override azure-ai-language-questionanswering azure-core<2.0.0,>=1.19.1
 #override azure-ai-language-questionanswering msrest>=0.6.21
 #override azure-search-documents azure-core<2.0.0,>=1.19.0
 #override azure-ai-formrecognizer msrest>=0.6.21
@@ -353,7 +353,7 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0
 #override azure-mgmt-azurearcdata msrest>=0.6.21
 #override azure-mgmt-servicelinker msrest>=0.6.21
 #override azure-mgmt-fluidrelay msrest>=0.6.21
-#override azure-ai-language-conversations azure-core<2.0.0,>=1.19.0
+#override azure-ai-language-conversations azure-core<2.0.0,>=1.19.1
 #override azure-ai-language-conversations msrest>=0.6.21
 #override azure-mgmt-dataprotection msrest>=0.6.21
 #override azure-mgmt-chaos msrest>=0.6.21