From 51041afd333202a8915a5c951723f86b379333aa Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Tue, 5 May 2020 13:30:09 -0500 Subject: [PATCH 1/3] Updated master to 4.10 --- .../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 ++-- .../functional-tests/functionaltestbot/requirements.txt | 2 +- libraries/functional-tests/functionaltestbot/setup.py | 2 +- 30 files changed, 56 insertions(+), 56 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py index 2babae85d..cd49e8844 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.7.1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" ) __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 4d6cdb67c..bf0c392fc 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ aiohttp pyslack -botbuilder-core>=4.7.1 +botbuilder-core>=4.10 slackclient \ No newline at end of file diff --git a/libraries/botbuilder-adapters-slack/setup.py b/libraries/botbuilder-adapters-slack/setup.py index d154572f2..5669ed41a 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.7.0", - "botframework-connector>=4.7.0", - "botbuilder-core>=4.7.0", + "botbuilder-schema>=4.10.0", + "botframework-connector>=4.10.0", + "botbuilder-core>=4.10.0", ] TEST_REQUIRES = ["aiounittest==1.3.0"] diff --git a/libraries/botbuilder-ai/botbuilder/ai/about.py b/libraries/botbuilder-ai/botbuilder/ai/about.py index 2fe559dac..a19b56332 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.7.1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" ) __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 dc2867a87..5a9c42801 100644 --- a/libraries/botbuilder-ai/requirements.txt +++ b/libraries/botbuilder-ai/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.10 -botbuilder-schema>=4.7.1 -botbuilder-core>=4.7.1 +botbuilder-schema>=4.10 +botbuilder-core>=4.10 requests==2.22.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 72f112a5a..76c1e1d41 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.7.1", - "botbuilder-core>=4.7.1", + "botbuilder-schema>=4.10", + "botbuilder-core>=4.10", "aiohttp==3.6.2", ] diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py index 4c5006f5f..f82e11fa3 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.7.1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" ) __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 e89251ff0..b9c954968 100644 --- a/libraries/botbuilder-applicationinsights/requirements.txt +++ b/libraries/botbuilder-applicationinsights/requirements.txt @@ -1,3 +1,3 @@ msrest==0.6.10 -botbuilder-core>=4.7.1 +botbuilder-core>=4.10 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 0e4429065..c60e2fdc8 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.7.1", - "botframework-connector>=4.7.1", - "botbuilder-core>=4.7.1", + "botbuilder-schema>=4.10", + "botframework-connector>=4.10", + "botbuilder-core>=4.10", ] 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 a2276b583..b7ad3c7c4 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.7.1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" ) __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 2245c3bbc..819ba0444 100644 --- a/libraries/botbuilder-azure/setup.py +++ b/libraries/botbuilder-azure/setup.py @@ -7,8 +7,8 @@ REQUIRES = [ "azure-cosmos==3.1.2", "azure-storage-blob==2.1.0", - "botbuilder-schema>=4.7.1", - "botframework-connector>=4.7.1", + "botbuilder-schema>=4.10", + "botframework-connector>=4.10", "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 f47c7fd78..889c80b20 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.7.1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" ) __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 330c0f2c4..e5bbd8ac8 100644 --- a/libraries/botbuilder-core/requirements.txt +++ b/libraries/botbuilder-core/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.10 -botframework-connector>=4.7.1 -botbuilder-schema>=4.7.1 +botframework-connector>=4.10 +botbuilder-schema>=4.10 requests==2.22.0 PyJWT==1.5.3 cryptography==2.8.0 diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index 21a356b49..64d55a776 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.7.1" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" REQUIRES = [ - "botbuilder-schema>=4.7.1", - "botframework-connector>=4.7.1", + "botbuilder-schema>=4.10", + "botframework-connector>=4.10", "jsonpickle==1.2", ] diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py index 2f0ceb142..dea274928 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.7.1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" ) __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 e9dd4585d..11d745c8b 100644 --- a/libraries/botbuilder-dialogs/requirements.txt +++ b/libraries/botbuilder-dialogs/requirements.txt @@ -1,7 +1,7 @@ msrest==0.6.10 -botframework-connector>=4.7.1 -botbuilder-schema>=4.7.1 -botbuilder-core>=4.7.1 +botframework-connector>=4.10 +botbuilder-schema>=4.10 +botbuilder-core>=4.10 requests==2.22.0 PyJWT==1.5.3 cryptography==2.8 diff --git a/libraries/botbuilder-dialogs/setup.py b/libraries/botbuilder-dialogs/setup.py index f242baec4..fd0aba48d 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.7.1", - "botframework-connector>=4.7.1", - "botbuilder-core>=4.7.1", + "botbuilder-schema>=4.10", + "botframework-connector>=4.10", + "botbuilder-core>=4.10", ] 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 c0bfc2c92..2d07554ca 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.7.1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" ) __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 1d6f7ab31..68f0d2298 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.7.1 -botbuilder-schema>=4.7.1 +botframework-connector>=4.10 +botbuilder-schema>=4.10 aiohttp>=3.6.2 \ No newline at end of file diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index df1778810..7aea4f75a 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.7.1" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" REQUIRES = [ - "botbuilder-schema>=4.7.1", - "botframework-connector>=4.7.1", - "botbuilder-core>=4.7.1", + "botbuilder-schema>=4.10", + "botframework-connector>=4.10", + "botbuilder-core>=4.10", "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 552d52e6e..a3018e1f0 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.7.1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" ) __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 ea8c2f359..9910c786f 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.7.1", - "botframework-connector>=4.7.1", - "botbuilder-core>=4.7.1", - "botbuilder-applicationinsights>=4.7.1", + "botbuilder-schema>=4.10", + "botframework-connector>=4.10", + "botbuilder-core>=4.10", + "botbuilder-applicationinsights>=4.10", ] TESTS_REQUIRES = [ "aiounittest==1.3.0", diff --git a/libraries/botbuilder-schema/setup.py b/libraries/botbuilder-schema/setup.py index bb183e091..e070ed2e3 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.7.1" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" 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 09585f325..c723fe73c 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.7.1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" ) __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 91ef96796..673728157 100644 --- a/libraries/botbuilder-testing/requirements.txt +++ b/libraries/botbuilder-testing/requirements.txt @@ -1,4 +1,4 @@ -botbuilder-schema>=4.7.1 -botbuilder-core>=4.7.1 -botbuilder-dialogs>=4.7.1 +botbuilder-schema>=4.10 +botbuilder-core>=4.10 +botbuilder-dialogs>=4.10 aiounittest==1.3.0 diff --git a/libraries/botbuilder-testing/setup.py b/libraries/botbuilder-testing/setup.py index 433235306..d2706a868 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.7.1", - "botbuilder-core>=4.7.1", - "botbuilder-dialogs>=4.7.1", + "botbuilder-schema>=4.10", + "botbuilder-core>=4.10", + "botbuilder-dialogs>=4.10", ] TESTS_REQUIRES = ["aiounittest==1.3.0"] diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt index 10b0b51a4..91fea4b63 100644 --- a/libraries/botframework-connector/requirements.txt +++ b/libraries/botframework-connector/requirements.txt @@ -1,5 +1,5 @@ msrest==0.6.10 -botbuilder-schema>=4.7.1 +botbuilder-schema>=4.10 requests==2.22.0 PyJWT==1.5.3 cryptography==2.8.0 diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 792c5d374..4cdce3dde 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -4,13 +4,13 @@ from setuptools import setup NAME = "botframework-connector" -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" REQUIRES = [ "msrest==0.6.10", "requests==2.22.0", "cryptography==2.8.0", "PyJWT==1.5.3", - "botbuilder-schema>=4.7.1", + "botbuilder-schema>=4.10", "adal==1.2.1", "msal==1.2.0", ] diff --git a/libraries/functional-tests/functionaltestbot/requirements.txt b/libraries/functional-tests/functionaltestbot/requirements.txt index a348b59af..b099b1ffd 100644 --- a/libraries/functional-tests/functionaltestbot/requirements.txt +++ b/libraries/functional-tests/functionaltestbot/requirements.txt @@ -1,5 +1,5 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -botbuilder-core>=4.5.0.b4 +botbuilder-core>=4.10 flask==1.1.1 diff --git a/libraries/functional-tests/functionaltestbot/setup.py b/libraries/functional-tests/functionaltestbot/setup.py index 1378ac4b0..8ad9c44c9 100644 --- a/libraries/functional-tests/functionaltestbot/setup.py +++ b/libraries/functional-tests/functionaltestbot/setup.py @@ -5,7 +5,7 @@ from setuptools import setup REQUIRES = [ - "botbuilder-core>=4.5.0.b4", + "botbuilder-core>=4.10", "flask==1.1.1", ] From a81087852a2176d6b1ed67d716ea11047244b721 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Tue, 5 May 2020 13:57:30 -0500 Subject: [PATCH 2/3] Updated master to 4.10.0 (the correct way this time) --- .../botbuilder/adapters/slack/about.py | 2 +- libraries/botbuilder-adapters-slack/requirements.txt | 2 +- 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 ++-- 27 files changed, 51 insertions(+), 51 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py index cd49e8844..3d082bf1e 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.10" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 bf0c392fc..03bb1696b 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ aiohttp pyslack -botbuilder-core>=4.10 +botbuilder-core>=4.10.0 slackclient \ No newline at end of file diff --git a/libraries/botbuilder-ai/botbuilder/ai/about.py b/libraries/botbuilder-ai/botbuilder/ai/about.py index a19b56332..dacddbf78 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.10" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 5a9c42801..8800f3187 100644 --- a/libraries/botbuilder-ai/requirements.txt +++ b/libraries/botbuilder-ai/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.10 -botbuilder-schema>=4.10 -botbuilder-core>=4.10 +botbuilder-schema>=4.10.0 +botbuilder-core>=4.10.0 requests==2.22.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 76c1e1d41..6ed1232dd 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.10", - "botbuilder-core>=4.10", + "botbuilder-schema>=4.10.0", + "botbuilder-core>=4.10.0", "aiohttp==3.6.2", ] diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py index f82e11fa3..a23f9b305 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.10" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 b9c954968..219d8769f 100644 --- a/libraries/botbuilder-applicationinsights/requirements.txt +++ b/libraries/botbuilder-applicationinsights/requirements.txt @@ -1,3 +1,3 @@ msrest==0.6.10 -botbuilder-core>=4.10 +botbuilder-core>=4.10.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 c60e2fdc8..5563b06ec 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.10", - "botframework-connector>=4.10", - "botbuilder-core>=4.10", + "botbuilder-schema>=4.10.0", + "botframework-connector>=4.10.0", + "botbuilder-core>=4.10.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 b7ad3c7c4..bd82fa9c9 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.10" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 819ba0444..e92b2def0 100644 --- a/libraries/botbuilder-azure/setup.py +++ b/libraries/botbuilder-azure/setup.py @@ -7,8 +7,8 @@ REQUIRES = [ "azure-cosmos==3.1.2", "azure-storage-blob==2.1.0", - "botbuilder-schema>=4.10", - "botframework-connector>=4.10", + "botbuilder-schema>=4.10.0", + "botframework-connector>=4.10.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 889c80b20..cff5f77f6 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.10" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 e5bbd8ac8..987bd67bb 100644 --- a/libraries/botbuilder-core/requirements.txt +++ b/libraries/botbuilder-core/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.10 -botframework-connector>=4.10 -botbuilder-schema>=4.10 +botframework-connector>=4.10.0 +botbuilder-schema>=4.10.0 requests==2.22.0 PyJWT==1.5.3 cryptography==2.8.0 diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index 64d55a776..f4e993c1f 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.10" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0" REQUIRES = [ - "botbuilder-schema>=4.10", - "botframework-connector>=4.10", + "botbuilder-schema>=4.10.0", + "botframework-connector>=4.10.0", "jsonpickle==1.2", ] diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py index dea274928..e4a8063ac 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.10" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 11d745c8b..70ab21445 100644 --- a/libraries/botbuilder-dialogs/requirements.txt +++ b/libraries/botbuilder-dialogs/requirements.txt @@ -1,7 +1,7 @@ msrest==0.6.10 -botframework-connector>=4.10 -botbuilder-schema>=4.10 -botbuilder-core>=4.10 +botframework-connector>=4.10.0 +botbuilder-schema>=4.10.0 +botbuilder-core>=4.10.0 requests==2.22.0 PyJWT==1.5.3 cryptography==2.8 diff --git a/libraries/botbuilder-dialogs/setup.py b/libraries/botbuilder-dialogs/setup.py index fd0aba48d..67d31f34e 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.10", - "botframework-connector>=4.10", - "botbuilder-core>=4.10", + "botbuilder-schema>=4.10.0", + "botframework-connector>=4.10.0", + "botbuilder-core>=4.10.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 2d07554ca..eedd1bfdc 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.10" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 68f0d2298..11a60fd4c 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.10 -botbuilder-schema>=4.10 +botframework-connector>=4.10.0 +botbuilder-schema>=4.10.0 aiohttp>=3.6.2 \ No newline at end of file diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index 7aea4f75a..fc1be7607 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.10" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0" REQUIRES = [ - "botbuilder-schema>=4.10", - "botframework-connector>=4.10", - "botbuilder-core>=4.10", + "botbuilder-schema>=4.10.0", + "botframework-connector>=4.10.0", + "botbuilder-core>=4.10.0", "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 a3018e1f0..51c0f5598 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.10" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 9910c786f..36a1224fb 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.10", - "botframework-connector>=4.10", - "botbuilder-core>=4.10", - "botbuilder-applicationinsights>=4.10", + "botbuilder-schema>=4.10.0", + "botframework-connector>=4.10.0", + "botbuilder-core>=4.10.0", + "botbuilder-applicationinsights>=4.10.0", ] TESTS_REQUIRES = [ "aiounittest==1.3.0", diff --git a/libraries/botbuilder-schema/setup.py b/libraries/botbuilder-schema/setup.py index e070ed2e3..98cd8d7d9 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.10" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 c723fe73c..9688528e4 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.10" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.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 673728157..3ca75dde5 100644 --- a/libraries/botbuilder-testing/requirements.txt +++ b/libraries/botbuilder-testing/requirements.txt @@ -1,4 +1,4 @@ -botbuilder-schema>=4.10 -botbuilder-core>=4.10 -botbuilder-dialogs>=4.10 +botbuilder-schema>=4.10.0 +botbuilder-core>=4.10.0 +botbuilder-dialogs>=4.10.0 aiounittest==1.3.0 diff --git a/libraries/botbuilder-testing/setup.py b/libraries/botbuilder-testing/setup.py index d2706a868..e45e0d1f2 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.10", - "botbuilder-core>=4.10", - "botbuilder-dialogs>=4.10", + "botbuilder-schema>=4.10.0", + "botbuilder-core>=4.10.0", + "botbuilder-dialogs>=4.10.0", ] TESTS_REQUIRES = ["aiounittest==1.3.0"] diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt index 91fea4b63..2511e913e 100644 --- a/libraries/botframework-connector/requirements.txt +++ b/libraries/botframework-connector/requirements.txt @@ -1,5 +1,5 @@ msrest==0.6.10 -botbuilder-schema>=4.10 +botbuilder-schema>=4.10.0 requests==2.22.0 PyJWT==1.5.3 cryptography==2.8.0 diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 4cdce3dde..1cc2844f1 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -4,13 +4,13 @@ from setuptools import setup NAME = "botframework-connector" -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0" REQUIRES = [ "msrest==0.6.10", "requests==2.22.0", "cryptography==2.8.0", "PyJWT==1.5.3", - "botbuilder-schema>=4.10", + "botbuilder-schema>=4.10.0", "adal==1.2.1", "msal==1.2.0", ] From 864ac8cbae72b27668218c44177238131ce9e412 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Tue, 5 May 2020 14:00:18 -0500 Subject: [PATCH 3/3] Udpated CI yaml to use 3.7.7 to make DevOps happy --- pipelines/botbuilder-python-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/botbuilder-python-ci.yml b/pipelines/botbuilder-python-ci.yml index d5c852b9e..bd3f81002 100644 --- a/pipelines/botbuilder-python-ci.yml +++ b/pipelines/botbuilder-python-ci.yml @@ -7,7 +7,7 @@ variables: COVERALLS_SERVICE_JOB_ID: $(Build.BuildId) COVERALLS_SERVICE_NAME: python-ci python.36: 3.6.10 - python.37: 3.7.6 + python.37: 3.7.7 python.38: 3.8.2 # PythonCoverallsToken: get this from Azure