From 7ba38cfdb7e46b7db30813774d47c5231b35fe06 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Fri, 5 Mar 2021 15:08:12 -0800 Subject: [PATCH 1/4] updating dependencies --- libraries/botbuilder-ai/setup.py | 2 +- libraries/botbuilder-ai/tests/requirements.txt | 2 +- libraries/botbuilder-azure/setup.py | 2 +- libraries/botbuilder-core/setup.py | 2 +- .../setup.py | 2 +- libraries/botframework-connector/setup.py | 5 ++--- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index 79f39a121..b75be914a 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.12.0", "botbuilder-core==4.12.0", - "aiohttp==3.6.2", + "aiohttp>=3.6.2,<3.8.0", ] TESTS_REQUIRES = ["aiounittest>=1.1.0"] diff --git a/libraries/botbuilder-ai/tests/requirements.txt b/libraries/botbuilder-ai/tests/requirements.txt index 93fc8e8ff..6e44e6902 100644 --- a/libraries/botbuilder-ai/tests/requirements.txt +++ b/libraries/botbuilder-ai/tests/requirements.txt @@ -1 +1 @@ -aioresponses==0.6.3 \ No newline at end of file +aioresponses>=0.7.1 \ No newline at end of file diff --git a/libraries/botbuilder-azure/setup.py b/libraries/botbuilder-azure/setup.py index 165800f3d..f57b94eca 100644 --- a/libraries/botbuilder-azure/setup.py +++ b/libraries/botbuilder-azure/setup.py @@ -9,7 +9,7 @@ "azure-storage-blob==12.7.0", "botbuilder-schema==4.12.0", "botframework-connector==4.12.0", - "jsonpickle==1.2", + "jsonpickle>=1.2,<1.5", ] TEST_REQUIRES = ["aiounittest==1.3.0"] diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index 5a144f90b..97d77e8e1 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -8,7 +8,7 @@ REQUIRES = [ "botbuilder-schema==4.12.0", "botframework-connector==4.12.0", - "jsonpickle==1.2", + "jsonpickle>=1.2,<1.5", ] 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 33f018439..97830d66d 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.6.2", + "aiohttp>=3.6.2,<3.8.0", "botbuilder-schema==4.12.0", "botframework-connector==4.12.0", "botbuilder-core==4.12.0", diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index a8f0728f4..1c28c1024 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -8,9 +8,8 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.12.0" REQUIRES = [ "msrest==0.6.10", - "requests==2.23.0", - "cryptography==3.3.2", - "PyJWT==1.5.3", + "requests>=2.23.0,<2.26", + "PyJWT>=1.5.3,<2.0.0", "botbuilder-schema==4.12.0", "adal==1.2.1", "msal==1.6.0", From bf27aabf18976356c23e733986dc2c982e591332 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Mon, 8 Mar 2021 09:51:38 -0800 Subject: [PATCH 2/4] adding integration aiohttp --- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index e1e06e54b..dd8e24bd5 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -10,7 +10,7 @@ "botframework-connector==4.12.0", "botbuilder-core==4.12.0", "yarl<=1.4.2", - "aiohttp==3.6.2", + "aiohttp>=3.6.2,<3.8.0", ] root = os.path.abspath(os.path.dirname(__file__)) From 3a9448b0db892a5145cc93a37b5e3c33d0edd874 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Mon, 8 Mar 2021 10:40:21 -0800 Subject: [PATCH 3/4] compatibility check --- libraries/botbuilder-ai/tests/requirements.txt | 2 +- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-ai/tests/requirements.txt b/libraries/botbuilder-ai/tests/requirements.txt index 6e44e6902..9dcdcd03f 100644 --- a/libraries/botbuilder-ai/tests/requirements.txt +++ b/libraries/botbuilder-ai/tests/requirements.txt @@ -1 +1 @@ -aioresponses>=0.7.1 \ No newline at end of file +aioresponses~=0.6.3 \ No newline at end of file diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index dd8e24bd5..65dc703a3 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -10,7 +10,7 @@ "botframework-connector==4.12.0", "botbuilder-core==4.12.0", "yarl<=1.4.2", - "aiohttp>=3.6.2,<3.8.0", + "aiohttp~=3.6.2", ] root = os.path.abspath(os.path.dirname(__file__)) From f30049720d868c5b91416bd664bf56f1e05b2ee1 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Wed, 7 Apr 2021 12:40:42 -0500 Subject: [PATCH 4/4] Removed unused adal dependency and update MSAL version --- libraries/botframework-connector/requirements.txt | 2 +- libraries/botframework-connector/setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt index 83fb8c6e2..3a604c487 100644 --- a/libraries/botframework-connector/requirements.txt +++ b/libraries/botframework-connector/requirements.txt @@ -3,4 +3,4 @@ botbuilder-schema==4.12.0 requests==2.23.0 PyJWT==1.5.3 cryptography==3.3.2 -msal==1.2.0 +msal==1.6.0 diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 1c28c1024..76621e967 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -11,7 +11,6 @@ "requests>=2.23.0,<2.26", "PyJWT>=1.5.3,<2.0.0", "botbuilder-schema==4.12.0", - "adal==1.2.1", "msal==1.6.0", ]