From 590f4bca08977895bfb486c436177e8fa718fd12 Mon Sep 17 00:00:00 2001 From: Tracy Boehrer Date: Mon, 5 Feb 2024 11:41:37 -0600 Subject: [PATCH 1/4] aiohttp to 3.9.2 --- libraries/botbuilder-adapters-slack/requirements.txt | 2 +- libraries/botbuilder-ai/setup.py | 2 +- libraries/botbuilder-integration-aiohttp/requirements.txt | 2 +- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- .../botbuilder-integration-applicationinsights-aiohttp/setup.py | 2 +- libraries/botframework-connector/tests/requirements.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/requirements.txt b/libraries/botbuilder-adapters-slack/requirements.txt index d157c7b0e..e62a4971e 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.9.0 +aiohttp==3.9.2 pyslack botbuilder-core==4.15.0 slackclient diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index 476d9a085..64a795ccd 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -8,7 +8,7 @@ "azure-cognitiveservices-language-luis==0.2.0", "botbuilder-schema==4.15.0", "botbuilder-core==4.15.0", - "aiohttp==3.8.5", + "aiohttp==3.9.2", ] TESTS_REQUIRES = ["aiounittest>=1.1.0"] diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index 558ae91d3..53ecba675 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ msrest== 0.7.* botframework-connector==4.15.0 botbuilder-schema==4.15.0 -aiohttp==3.9.0 +aiohttp==3.9.2 diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index 5ab268470..41e14ec59 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -10,7 +10,7 @@ "botframework-connector==4.15.0", "botbuilder-core==4.15.0", "yarl>=1.8.1", - "aiohttp==3.8.5", + "aiohttp==3.9.2", ] root = os.path.abspath(os.path.dirname(__file__)) diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index f6b661c88..8e7a79246 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "applicationinsights>=0.11.9", - "aiohttp==3.8.5", + "aiohttp==3.9.2", "botbuilder-schema==4.15.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", diff --git a/libraries/botframework-connector/tests/requirements.txt b/libraries/botframework-connector/tests/requirements.txt index 62eb5aba5..dfbb418bd 100644 --- a/libraries/botframework-connector/tests/requirements.txt +++ b/libraries/botframework-connector/tests/requirements.txt @@ -1,5 +1,5 @@ pytest-cov>=2.6.0 -pytest~=6.2.3 +pytest~=7.3.1 pyyaml==6.0 pytest-asyncio==0.15.1 ddt==1.2.1 \ No newline at end of file From 793862d89bffc8f9055f44b5784003dba50e6e3a Mon Sep 17 00:00:00 2001 From: Tracy Boehrer Date: Thu, 8 Feb 2024 09:07:36 -0600 Subject: [PATCH 2/4] aiohttp to 3.9.3 --- libraries/botbuilder-adapters-slack/requirements.txt | 2 +- libraries/botbuilder-ai/setup.py | 2 +- libraries/botbuilder-integration-aiohttp/requirements.txt | 2 +- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- .../botbuilder-integration-applicationinsights-aiohttp/setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/requirements.txt b/libraries/botbuilder-adapters-slack/requirements.txt index e62a4971e..312d38e8a 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.9.2 +aiohttp==3.9.3 pyslack botbuilder-core==4.15.0 slackclient diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index 64a795ccd..0b61efc81 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -8,7 +8,7 @@ "azure-cognitiveservices-language-luis==0.2.0", "botbuilder-schema==4.15.0", "botbuilder-core==4.15.0", - "aiohttp==3.9.2", + "aiohttp==3.9.3", ] TESTS_REQUIRES = ["aiounittest>=1.1.0"] diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index 53ecba675..85b38ee6f 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ msrest== 0.7.* botframework-connector==4.15.0 botbuilder-schema==4.15.0 -aiohttp==3.9.2 +aiohttp==3.9.3 diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index 41e14ec59..b69be5e90 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -10,7 +10,7 @@ "botframework-connector==4.15.0", "botbuilder-core==4.15.0", "yarl>=1.8.1", - "aiohttp==3.9.2", + "aiohttp==3.9.3", ] root = os.path.abspath(os.path.dirname(__file__)) diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index 8e7a79246..f4b9933b8 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "applicationinsights>=0.11.9", - "aiohttp==3.9.2", + "aiohttp==3.9.3", "botbuilder-schema==4.15.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", From cac26bb763b868c9fcb174feaf7c57e87542c1dd Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Thu, 8 Feb 2024 09:07:16 -0600 Subject: [PATCH 3/4] Update botbuilder-python-ci.yml for Azure Pipelines Changed Python build versions --- pipelines/botbuilder-python-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pipelines/botbuilder-python-ci.yml b/pipelines/botbuilder-python-ci.yml index eecc05394..8d55cd230 100644 --- a/pipelines/botbuilder-python-ci.yml +++ b/pipelines/botbuilder-python-ci.yml @@ -6,8 +6,9 @@ variables: COVERALLS_GIT_COMMIT: $(Build.SourceVersion) COVERALLS_SERVICE_JOB_ID: $(Build.BuildId) COVERALLS_SERVICE_NAME: python-ci - python.37: 3.7 python.38: 3.8 + python.39: 3.9 + python.310: 3.10 python.311: 3.11 # PythonCoverallsToken: get this from Azure @@ -20,10 +21,12 @@ jobs: strategy: matrix: - Python37: - PYTHON_VERSION: '$(python.37)' Python38: PYTHON_VERSION: '$(python.38)' + Python39: + PYTHON_VERSION: '$(python.39)' + Python310: + PYTHON_VERSION: '$(python.310)' Python311: PYTHON_VERSION: '$(python.311)' maxParallel: 3 From 4c47e5f5b0d923d560f15dd30b0da7ea269dc61e Mon Sep 17 00:00:00 2001 From: Tracy Boehrer Date: Thu, 8 Feb 2024 09:30:12 -0600 Subject: [PATCH 4/4] Updated README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4b7d3ff4f..df939dd52 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repository contains code for the Python version of the [Microsoft Bot Framework SDK](https://github.com/Microsoft/botframework-sdk), which is part of the Microsoft Bot Framework - a comprehensive framework for building enterprise-grade conversational AI experiences. -This SDK enables developers to model conversation and build sophisticated bot applications using Python. SDKs for [JavaScript](https://github.com/Microsoft/botbuilder-js), [.NET](https://github.com/Microsoft/botbuilder-dotnet) and [Java (preview)](https://github.com/Microsoft/botbuilder-java) are also available. +This SDK enables developers to model conversation and build sophisticated bot applications using Python. SDKs for [JavaScript](https://github.com/Microsoft/botbuilder-js) and [.NET](https://github.com/Microsoft/botbuilder-dotnet) are also available. To get started building bots using the SDK, see the [Azure Bot Service Documentation](https://docs.microsoft.com/en-us/azure/bot-service/?view=azure-bot-service-4.0). @@ -43,7 +43,7 @@ If you want to debug an issue, would like to [contribute](#contributing-code), o ### Prerequisites - [Git](https://git-scm.com/downloads) -- [Python 3.8.2](https://www.python.org/downloads/) +- [Python 3.8.17](https://www.python.org/downloads/) Python "Virtual Environments" allow Python packages to be installed in an isolated location for a particular application, rather than being installed globally, as such it is common practice to use them. Click [here](https://packaging.python.org/tutorials/installing-packages/#creating-virtual-environments) to learn more about creating _and activating_ Virtual Environments in Python.