diff --git a/libraries/botbuilder-adapters-slack/requirements.txt b/libraries/botbuilder-adapters-slack/requirements.txt index 4b93ca95a..d157c7b0e 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.8.5 +aiohttp==3.9.0 pyslack botbuilder-core==4.15.0 slackclient diff --git a/libraries/botbuilder-ai/requirements.txt b/libraries/botbuilder-ai/requirements.txt index b1b9ce14a..221374746 100644 --- a/libraries/botbuilder-ai/requirements.txt +++ b/libraries/botbuilder-ai/requirements.txt @@ -1,4 +1,4 @@ -msrest==0.6.* +msrest== 0.7.* botbuilder-schema==4.15.0 botbuilder-core==4.15.0 requests==2.31.0 diff --git a/libraries/botbuilder-applicationinsights/django_tests/views.py b/libraries/botbuilder-applicationinsights/django_tests/views.py index 181ca847c..c91c0bbb5 100644 --- a/libraries/botbuilder-applicationinsights/django_tests/views.py +++ b/libraries/botbuilder-applicationinsights/django_tests/views.py @@ -52,7 +52,7 @@ def getid(request, id): @api_view(["POST"]) def returncode(request, id): - return HttpResponse("Status code set to %s" % id, status=int(id)) + return HttpResponse("returncode", status=int(id)) @api_view(["POST"]) diff --git a/libraries/botbuilder-applicationinsights/requirements.txt b/libraries/botbuilder-applicationinsights/requirements.txt index 13d71acfd..7d22c3724 100644 --- a/libraries/botbuilder-applicationinsights/requirements.txt +++ b/libraries/botbuilder-applicationinsights/requirements.txt @@ -1,3 +1,3 @@ -msrest==0.6.* +msrest== 0.7.* botbuilder-core==4.15.0 aiounittest==1.3.0 \ No newline at end of file diff --git a/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py b/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py index 56976ac94..c5eda9589 100644 --- a/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py +++ b/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py @@ -150,6 +150,7 @@ async def continue_conversation( # pylint: disable=arguments-differ self, reference: ConversationReference, callback: Callable, + bot_app_id: str, ): """ Sends a proactive message to a conversation. @@ -161,9 +162,12 @@ async def continue_conversation( # pylint: disable=arguments-differ :type reference: :class:`botbuilder.schema.ConversationReference` :param callback: The method to call for the resulting bot turn. :type callback: :class:`typing.Callable` + :param bot_app_id: The application Id of the bot. This is the appId returned by the Azure portal registration, + and is generally found in the `MicrosoftAppId` parameter in `config.py`. + :type bot_app_id: :class:`typing.str` """ return await self.process_proactive( - self.create_claims_identity(), + self.create_claims_identity(bot_app_id), get_continuation_activity(reference), None, callback, @@ -182,7 +186,7 @@ async def continue_conversation_with_claims( async def create_conversation( # pylint: disable=arguments-differ self, - bot_app_id: ConversationReference, + bot_app_id: str, callback: Callable[[TurnContext], Awaitable] = None, conversation_parameters: ConversationParameters = None, channel_id: str = None, diff --git a/libraries/botbuilder-core/requirements.txt b/libraries/botbuilder-core/requirements.txt index 00c320b22..5a8a126bb 100644 --- a/libraries/botbuilder-core/requirements.txt +++ b/libraries/botbuilder-core/requirements.txt @@ -1,8 +1,8 @@ -msrest==0.6.* +msrest== 0.7.* botframework-connector==4.15.0 botbuilder-schema==4.15.0 botframework-streaming==4.15.0 requests==2.31.0 PyJWT==2.4.0 -cryptography==41.0.4 +cryptography==41.0.6 aiounittest==1.3.0 \ No newline at end of file diff --git a/libraries/botbuilder-dialogs/requirements.txt b/libraries/botbuilder-dialogs/requirements.txt index 373827330..3d2fd9080 100644 --- a/libraries/botbuilder-dialogs/requirements.txt +++ b/libraries/botbuilder-dialogs/requirements.txt @@ -1,8 +1,8 @@ -msrest==0.6.* +msrest== 0.7.* botframework-connector==4.15.0 botbuilder-schema==4.15.0 botbuilder-core==4.15.0 requests==2.31.0 PyJWT==2.4.0 -cryptography==41.0.4 +cryptography==41.0.6 aiounittest==1.3.0 diff --git a/libraries/botbuilder-dialogs/setup.py b/libraries/botbuilder-dialogs/setup.py index 6e97715a5..574f8bbe7 100644 --- a/libraries/botbuilder-dialogs/setup.py +++ b/libraries/botbuilder-dialogs/setup.py @@ -5,7 +5,7 @@ from setuptools import setup REQUIRES = [ - "regex<=2019.08.19", + "regex>=2022.1.18", "emoji==1.7.0", "recognizers-text-date-time>=1.0.2a1", "recognizers-text-number-with-unit>=1.0.2a1", diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index 3e2517b24..558ae91d3 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ -msrest==0.6.* +msrest== 0.7.* botframework-connector==4.15.0 botbuilder-schema==4.15.0 -aiohttp==3.8.5 +aiohttp==3.9.0 diff --git a/libraries/botbuilder-schema/requirements.txt b/libraries/botbuilder-schema/requirements.txt index 908ffb023..c6b07eaec 100644 --- a/libraries/botbuilder-schema/requirements.txt +++ b/libraries/botbuilder-schema/requirements.txt @@ -1,2 +1,2 @@ aiounittest==1.3.0 -msrest==0.6.* \ No newline at end of file +msrest== 0.7.* \ No newline at end of file diff --git a/libraries/botbuilder-schema/setup.py b/libraries/botbuilder-schema/setup.py index 3f056bc72..ac285ff01 100644 --- a/libraries/botbuilder-schema/setup.py +++ b/libraries/botbuilder-schema/setup.py @@ -6,7 +6,7 @@ NAME = "botbuilder-schema" VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" -REQUIRES = ["msrest==0.6.*", "urllib3<2.0.0"] +REQUIRES = ["msrest== 0.7.*", "urllib3<2.0.0"] root = os.path.abspath(os.path.dirname(__file__)) diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt index f90cd0860..0b30023a1 100644 --- a/libraries/botframework-connector/requirements.txt +++ b/libraries/botframework-connector/requirements.txt @@ -1,6 +1,6 @@ -msrest==0.6.* +msrest==0.7.* botbuilder-schema==4.15.0 requests==2.31.0 PyJWT==2.4.0 -cryptography==41.0.4 +cryptography==41.0.6 msal==1.* diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 15411c492..2e6c8fe64 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -7,7 +7,7 @@ NAME = "botframework-connector" VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ - "msrest==0.6.*", + "msrest==0.7.*", # "requests>=2.23.0,<2.26", "PyJWT>=2.4.0", "botbuilder-schema==4.15.0", diff --git a/libraries/botframework-streaming/requirements.txt b/libraries/botframework-streaming/requirements.txt index 004ce4c73..c806f7e77 100644 --- a/libraries/botframework-streaming/requirements.txt +++ b/libraries/botframework-streaming/requirements.txt @@ -1,3 +1,3 @@ -msrest==0.6.* +msrest==0.7.* botframework-connector>=4.15.0 botbuilder-schema>=4.15.0 \ No newline at end of file diff --git a/pipelines/botbuilder-python-ci.yml b/pipelines/botbuilder-python-ci.yml index 04a848e1f..802f49481 100644 --- a/pipelines/botbuilder-python-ci.yml +++ b/pipelines/botbuilder-python-ci.yml @@ -6,8 +6,8 @@ variables: COVERALLS_GIT_COMMIT: $(Build.SourceVersion) COVERALLS_SERVICE_JOB_ID: $(Build.BuildId) COVERALLS_SERVICE_NAME: python-ci - python.37: 3.7.x - python.38: 3.8.x + python.37: 3.7 + python.38: 3.8 # python.311: 3.11.x # PythonCoverallsToken: get this from Azure @@ -60,6 +60,12 @@ jobs: pip install black==22.3.0 displayName: 'Install dependencies' + - script: 'black --check libraries' + displayName: 'Check Black compliant' + + - script: 'pylint --rcfile=.pylintrc libraries' + displayName: Pylint + - script: | pip install pytest pip install pytest-cov @@ -80,12 +86,6 @@ jobs: testResultsFiles: '**/test-results.$(PYTHON_VERSION).xml' testRunTitle: 'Python $(PYTHON_VERSION)' - - script: 'black --check libraries' - displayName: 'Check Black compliant' - - - script: 'pylint --rcfile=.pylintrc libraries' - displayName: Pylint - - script: 'COVERALLS_REPO_TOKEN=$(PythonCoverallsToken) coveralls' displayName: 'Push test results to coveralls https://coveralls.io/github/microsoft/botbuilder-python' continueOnError: true