From 7fdfde772620f2b616a8f917588896bd6f539de0 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Tue, 23 Feb 2021 09:34:14 -0600 Subject: [PATCH 1/2] Bump to 4.13.0 --- .../botbuilder/adapters/slack/about.py | 2 +- libraries/botbuilder-adapters-slack/requirements.txt | 2 +- libraries/botbuilder-adapters-slack/setup.py | 6 +++--- libraries/botbuilder-ai/botbuilder/ai/about.py | 2 +- libraries/botbuilder-ai/requirements.txt | 4 ++-- libraries/botbuilder-ai/setup.py | 4 ++-- .../botbuilder/applicationinsights/about.py | 2 +- libraries/botbuilder-applicationinsights/requirements.txt | 2 +- libraries/botbuilder-applicationinsights/setup.py | 6 +++--- libraries/botbuilder-azure/botbuilder/azure/about.py | 2 +- libraries/botbuilder-azure/setup.py | 4 ++-- libraries/botbuilder-core/botbuilder/core/about.py | 2 +- libraries/botbuilder-core/requirements.txt | 4 ++-- libraries/botbuilder-core/setup.py | 6 +++--- libraries/botbuilder-dialogs/botbuilder/dialogs/about.py | 2 +- libraries/botbuilder-dialogs/requirements.txt | 6 +++--- libraries/botbuilder-dialogs/setup.py | 6 +++--- .../botbuilder/integration/aiohttp/about.py | 2 +- libraries/botbuilder-integration-aiohttp/requirements.txt | 4 ++-- libraries/botbuilder-integration-aiohttp/setup.py | 8 ++++---- .../integration/applicationinsights/aiohttp/about.py | 2 +- .../setup.py | 8 ++++---- libraries/botbuilder-schema/setup.py | 2 +- libraries/botbuilder-testing/botbuilder/testing/about.py | 2 +- libraries/botbuilder-testing/requirements.txt | 6 +++--- libraries/botbuilder-testing/setup.py | 6 +++--- libraries/botframework-connector/requirements.txt | 2 +- libraries/botframework-connector/setup.py | 4 ++-- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py index 405dd97ef..60cbe9589 100644 --- a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py +++ b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-adapters-slack" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-adapters-slack/requirements.txt b/libraries/botbuilder-adapters-slack/requirements.txt index 69aba26a6..d61d2f808 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ aiohttp==3.6.2 pyslack -botbuilder-core==4.12.0 +botbuilder-core==4.13.0 slackclient \ No newline at end of file diff --git a/libraries/botbuilder-adapters-slack/setup.py b/libraries/botbuilder-adapters-slack/setup.py index 0f121de69..d6fabb3de 100644 --- a/libraries/botbuilder-adapters-slack/setup.py +++ b/libraries/botbuilder-adapters-slack/setup.py @@ -5,9 +5,9 @@ from setuptools import setup REQUIRES = [ - "botbuilder-schema==4.12.0", - "botframework-connector==4.12.0", - "botbuilder-core==4.12.0", + "botbuilder-schema==4.13.0", + "botframework-connector==4.13.0", + "botbuilder-core==4.13.0", "pyslack", "slackclient", ] diff --git a/libraries/botbuilder-ai/botbuilder/ai/about.py b/libraries/botbuilder-ai/botbuilder/ai/about.py index 5439d7f89..6c2d1376e 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/about.py +++ b/libraries/botbuilder-ai/botbuilder/ai/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-ai" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-ai/requirements.txt b/libraries/botbuilder-ai/requirements.txt index 2d1b061e8..fcd96ac6c 100644 --- a/libraries/botbuilder-ai/requirements.txt +++ b/libraries/botbuilder-ai/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.10 -botbuilder-schema==4.12.0 -botbuilder-core==4.12.0 +botbuilder-schema==4.13.0 +botbuilder-core==4.13.0 requests==2.23.0 aiounittest==1.3.0 azure-cognitiveservices-language-luis==0.2.0 \ No newline at end of file diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index 79f39a121..a59f0f524 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -6,8 +6,8 @@ REQUIRES = [ "azure-cognitiveservices-language-luis==0.2.0", - "botbuilder-schema==4.12.0", - "botbuilder-core==4.12.0", + "botbuilder-schema==4.13.0", + "botbuilder-core==4.13.0", "aiohttp==3.6.2", ] diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py index 841b3ba9a..6b227e889 100644 --- a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py +++ b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py @@ -6,7 +6,7 @@ __title__ = "botbuilder-applicationinsights" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-applicationinsights/requirements.txt b/libraries/botbuilder-applicationinsights/requirements.txt index 6c59cce95..712ec8033 100644 --- a/libraries/botbuilder-applicationinsights/requirements.txt +++ b/libraries/botbuilder-applicationinsights/requirements.txt @@ -1,3 +1,3 @@ msrest==0.6.10 -botbuilder-core==4.12.0 +botbuilder-core==4.13.0 aiounittest==1.3.0 \ No newline at end of file diff --git a/libraries/botbuilder-applicationinsights/setup.py b/libraries/botbuilder-applicationinsights/setup.py index 0f2706e9f..d266ca405 100644 --- a/libraries/botbuilder-applicationinsights/setup.py +++ b/libraries/botbuilder-applicationinsights/setup.py @@ -6,9 +6,9 @@ REQUIRES = [ "applicationinsights==0.11.9", - "botbuilder-schema==4.12.0", - "botframework-connector==4.12.0", - "botbuilder-core==4.12.0", + "botbuilder-schema==4.13.0", + "botframework-connector==4.13.0", + "botbuilder-core==4.13.0", ] TESTS_REQUIRES = [ "aiounittest==1.3.0", diff --git a/libraries/botbuilder-azure/botbuilder/azure/about.py b/libraries/botbuilder-azure/botbuilder/azure/about.py index 9052a0c03..3632d2de6 100644 --- a/libraries/botbuilder-azure/botbuilder/azure/about.py +++ b/libraries/botbuilder-azure/botbuilder/azure/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-azure" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-azure/setup.py b/libraries/botbuilder-azure/setup.py index 165800f3d..a67383ad7 100644 --- a/libraries/botbuilder-azure/setup.py +++ b/libraries/botbuilder-azure/setup.py @@ -7,8 +7,8 @@ REQUIRES = [ "azure-cosmos==3.2.0", "azure-storage-blob==12.7.0", - "botbuilder-schema==4.12.0", - "botframework-connector==4.12.0", + "botbuilder-schema==4.13.0", + "botframework-connector==4.13.0", "jsonpickle==1.2", ] TEST_REQUIRES = ["aiounittest==1.3.0"] diff --git a/libraries/botbuilder-core/botbuilder/core/about.py b/libraries/botbuilder-core/botbuilder/core/about.py index d8fbaf9f3..1f10a74f8 100644 --- a/libraries/botbuilder-core/botbuilder/core/about.py +++ b/libraries/botbuilder-core/botbuilder/core/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-core" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-core/requirements.txt b/libraries/botbuilder-core/requirements.txt index 00bfd37a1..632e7d17b 100644 --- a/libraries/botbuilder-core/requirements.txt +++ b/libraries/botbuilder-core/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.10 -botframework-connector==4.12.0 -botbuilder-schema==4.12.0 +botframework-connector==4.13.0 +botbuilder-schema==4.13.0 requests==2.23.0 PyJWT==1.5.3 cryptography==3.3.2 diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index 5a144f90b..043fe81be 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -4,10 +4,10 @@ import os from setuptools import setup -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" REQUIRES = [ - "botbuilder-schema==4.12.0", - "botframework-connector==4.12.0", + "botbuilder-schema==4.13.0", + "botframework-connector==4.13.0", "jsonpickle==1.2", ] diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py index 7aa7b0a4f..ea6e5789d 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-dialogs" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-dialogs/requirements.txt b/libraries/botbuilder-dialogs/requirements.txt index f16a81c13..497feb2bc 100644 --- a/libraries/botbuilder-dialogs/requirements.txt +++ b/libraries/botbuilder-dialogs/requirements.txt @@ -1,7 +1,7 @@ msrest==0.6.10 -botframework-connector==4.12.0 -botbuilder-schema==4.12.0 -botbuilder-core==4.12.0 +botframework-connector==4.13.0 +botbuilder-schema==4.13.0 +botbuilder-core==4.13.0 requests==2.23.0 PyJWT==1.5.3 cryptography==3.3.2 diff --git a/libraries/botbuilder-dialogs/setup.py b/libraries/botbuilder-dialogs/setup.py index 236618573..b0c738e42 100644 --- a/libraries/botbuilder-dialogs/setup.py +++ b/libraries/botbuilder-dialogs/setup.py @@ -12,9 +12,9 @@ "recognizers-text>=1.0.2a1", "recognizers-text-choice>=1.0.2a1", "babel==2.7.0", - "botbuilder-schema==4.12.0", - "botframework-connector==4.12.0", - "botbuilder-core==4.12.0", + "botbuilder-schema==4.13.0", + "botframework-connector==4.13.0", + "botbuilder-core==4.13.0", ] TEST_REQUIRES = ["aiounittest==1.3.0"] diff --git a/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/about.py b/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/about.py index 9ba957138..625dcfad0 100644 --- a/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/about.py +++ b/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-integration-aiohttp" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index 2d93ed698..e4611f584 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ msrest==0.6.10 -botframework-connector==4.12.0 -botbuilder-schema==4.12.0 +botframework-connector==4.13.0 +botbuilder-schema==4.13.0 aiohttp==3.6.2 diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index e1e06e54b..fa517459b 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -4,11 +4,11 @@ import os from setuptools import setup -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" REQUIRES = [ - "botbuilder-schema==4.12.0", - "botframework-connector==4.12.0", - "botbuilder-core==4.12.0", + "botbuilder-schema==4.13.0", + "botframework-connector==4.13.0", + "botbuilder-core==4.13.0", "yarl<=1.4.2", "aiohttp==3.6.2", ] diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/botbuilder/integration/applicationinsights/aiohttp/about.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/botbuilder/integration/applicationinsights/aiohttp/about.py index 0365e66df..f1d4aaa35 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/botbuilder/integration/applicationinsights/aiohttp/about.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/botbuilder/integration/applicationinsights/aiohttp/about.py @@ -6,7 +6,7 @@ __title__ = "botbuilder-integration-applicationinsights-aiohttp" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index 33f018439..dc2c95176 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -7,10 +7,10 @@ REQUIRES = [ "applicationinsights>=0.11.9", "aiohttp==3.6.2", - "botbuilder-schema==4.12.0", - "botframework-connector==4.12.0", - "botbuilder-core==4.12.0", - "botbuilder-applicationinsights==4.12.0", + "botbuilder-schema==4.13.0", + "botframework-connector==4.13.0", + "botbuilder-core==4.13.0", + "botbuilder-applicationinsights==4.13.0", ] TESTS_REQUIRES = [ "aiounittest==1.3.0", diff --git a/libraries/botbuilder-schema/setup.py b/libraries/botbuilder-schema/setup.py index 06dc7339e..79e97fecd 100644 --- a/libraries/botbuilder-schema/setup.py +++ b/libraries/botbuilder-schema/setup.py @@ -5,7 +5,7 @@ from setuptools import setup NAME = "botbuilder-schema" -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" REQUIRES = ["msrest==0.6.10"] root = os.path.abspath(os.path.dirname(__file__)) diff --git a/libraries/botbuilder-testing/botbuilder/testing/about.py b/libraries/botbuilder-testing/botbuilder/testing/about.py index 4817b2d45..445a53fde 100644 --- a/libraries/botbuilder-testing/botbuilder/testing/about.py +++ b/libraries/botbuilder-testing/botbuilder/testing/about.py @@ -6,7 +6,7 @@ __title__ = "botbuilder-testing" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-testing/requirements.txt b/libraries/botbuilder-testing/requirements.txt index 18a973dc1..76ee9b2b4 100644 --- a/libraries/botbuilder-testing/requirements.txt +++ b/libraries/botbuilder-testing/requirements.txt @@ -1,4 +1,4 @@ -botbuilder-schema==4.12.0 -botbuilder-core==4.12.0 -botbuilder-dialogs==4.12.0 +botbuilder-schema==4.13.0 +botbuilder-core==4.13.0 +botbuilder-dialogs==4.13.0 aiounittest==1.3.0 diff --git a/libraries/botbuilder-testing/setup.py b/libraries/botbuilder-testing/setup.py index a10601cf9..af36832cd 100644 --- a/libraries/botbuilder-testing/setup.py +++ b/libraries/botbuilder-testing/setup.py @@ -5,9 +5,9 @@ from setuptools import setup REQUIRES = [ - "botbuilder-schema==4.12.0", - "botbuilder-core==4.12.0", - "botbuilder-dialogs==4.12.0", + "botbuilder-schema==4.13.0", + "botbuilder-core==4.13.0", + "botbuilder-dialogs==4.13.0", ] TESTS_REQUIRES = ["aiounittest==1.3.0"] diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt index 83fb8c6e2..aa837168b 100644 --- a/libraries/botframework-connector/requirements.txt +++ b/libraries/botframework-connector/requirements.txt @@ -1,5 +1,5 @@ msrest==0.6.10 -botbuilder-schema==4.12.0 +botbuilder-schema==4.13.0 requests==2.23.0 PyJWT==1.5.3 cryptography==3.3.2 diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index a8f0728f4..15ed0e99b 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -5,13 +5,13 @@ from setuptools import setup NAME = "botframework-connector" -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.13.0" REQUIRES = [ "msrest==0.6.10", "requests==2.23.0", "cryptography==3.3.2", "PyJWT==1.5.3", - "botbuilder-schema==4.12.0", + "botbuilder-schema==4.13.0", "adal==1.2.1", "msal==1.6.0", ] From 0af45fc4de9968f3aea380ceb27fbc0ddacb1134 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Tue, 23 Feb 2021 10:10:32 -0600 Subject: [PATCH 2/2] Updated README for 4.13 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a56965a14..d787b9017 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ For more information jump to a section below. | Branch | Description | Build Status | Coverage Status | Code Style | |----|---------------|--------------|-----------------|--| -| Main | 4.12.* Preview Builds | [![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/Python-CI-PR-yaml?branchName=main)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=771&branchName=main) | [![Coverage Status](https://coveralls.io/repos/github/microsoft/botbuilder-python/badge.svg?branch=HEAD)](https://coveralls.io/github/microsoft/botbuilder-python?branch=HEAD) | [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) | +| Main | 4.13.* Preview Builds | [![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/Python-CI-PR-yaml?branchName=main)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=771&branchName=main) | [![Coverage Status](https://coveralls.io/repos/github/microsoft/botbuilder-python/badge.svg?branch=HEAD)](https://coveralls.io/github/microsoft/botbuilder-python?branch=HEAD) | [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) | ## Packages