Axsuarez/minor bug fixes

libraries/botbuilder-ai/README.rst

@@ -0,0 +1,84 @@
+
+============================
+BotBuilder-AI SDK for Python
+============================
+
+.. image:: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI?branchName=master
+   :target:  https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI
+   :align: right
+   :alt: Azure DevOps status for master branch
+.. image:: https://badge.fury.io/py/botbuilder-ai.svg
+   :target: https://badge.fury.io/py/botbuilder-ai
+   :alt: Latest PyPI package version
+
+Cognitive services extensions for Microsoft BotBuilder.
+
+
+How to Install
+==============
+
+.. code-block:: python
+  
+  pip install botbuilder-ai
+
+
+Documentation/Wiki
+==================
+
+You can find more information on the botbuilder-python project by visiting our `Wiki`_.
+
+Requirements
+============
+
+* `Python >= 3.7.3`_
+
+
+Source Code
+===========
+The latest developer version is available in a github repository:
+https://github.com/Microsoft/botbuilder-python/
+
+
+Contributing
+============
+
+This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
+the rights to use your contribution. For details, visit https://cla.microsoft.com.
+
+When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
+a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
+provided by the bot. You will only need to do this once across all repos using our CLA.
+
+This project has adopted the `Microsoft Open Source Code of Conduct`_.
+For more information see the `Code of Conduct FAQ`_ or
+contact `[email protected]`_ with any additional questions or comments.
+
+Reporting Security Issues
+=========================
+
+Security issues and bugs should be reported privately, via email, to the Microsoft Security
+Response Center (MSRC) at `[email protected]`_. You should
+receive a response within 24 hours. If for some reason you do not, please follow up via
+email to ensure we received your original message. Further information, including the
+`MSRC PGP`_ key, can be found in
+the `Security TechCenter`_.
+
+License
+=======
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the MIT_ License.
+
+.. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
+.. _Python >= 3.7.3: https://www.python.org/downloads/
+.. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
+.. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
+.. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/
+.. _[email protected]: mailto:[email protected]
+.. _[email protected]: mailto:[email protected]
+.. _MSRC PGP: https://technet.microsoft.com/en-us/security/dn606155
+.. _Security TechCenter: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
+
+.. <https://technet.microsoft.com/en-us/security/default>`_

libraries/botbuilder-ai/setup.py

@@ -22,21 +22,25 @@
     info = f.read()
     exec(info, package_info)
 
+with open(os.path.join(root, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
 setup(
     name=package_info["__title__"],
     version=package_info["__version__"],
     url=package_info["__uri__"],
     author=package_info["__author__"],
     description=package_info["__description__"],
     keywords="botbuilder-ai LUIS QnAMaker bots ai botframework botbuilder",
-    long_description=package_info["__summary__"],
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
     license=package_info["__license__"],
     packages=["botbuilder.ai", "botbuilder.ai.qna", "botbuilder.ai.luis"],
     install_requires=REQUIRES + TESTS_REQUIRES,
     tests_require=TESTS_REQUIRES,
     include_package_data=True,
     classifiers=[
-        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",

libraries/botbuilder-applicationinsights/README.rst

@@ -7,8 +7,8 @@ BotBuilder-ApplicationInsights SDK for Python
    :target:  https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI
    :align: right
    :alt: Azure DevOps status for master branch
-.. image:: https://badge.fury.io/py/botbuilder-core.svg
-   :target: https://badge.fury.io/py/botbuilder-core
+.. image:: https://badge.fury.io/py/botbuilder-applicationinsights.svg
+   :target: https://badge.fury.io/py/botbuilder-applicationinsights
    :alt: Latest PyPI package version
 
 Within the Bot Framework, BotBuilder-ApplicationInsights enables the Azure Application Insights service.
@@ -33,7 +33,7 @@ You can find more information on the botbuilder-python project by visiting our `
 Requirements
 ============
 
-* `Python >= 3.6.8`_
+* `Python >= 3.7.3`_
 
 
 Source Code
@@ -75,7 +75,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 Licensed under the MIT_ License.
 
 .. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
-.. _Python >= 3.6.8: https://www.python.org/downloads/
+.. _Python >= 3.7.3: https://www.python.org/downloads/
 .. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
 .. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
 .. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/

libraries/botbuilder-applicationinsights/django_tests/README.md

@@ -9,7 +9,7 @@ Django generates *code* to create projects (`django-admin startproject`) and app
 
 File | | Description
 --- | ---
-all_tests.sh | Runs our current test matrix of python/django versions.  Current matrix is python (3.6) and django (2.2). 
+all_tests.sh | Runs our current test matrix of python/django versions.  Current matrix is python (3.7) and django (2.2). 
 README.md | This file.
 run_test.sh | Runs specific python/django version to create project, copy replacement files and runs tests.
 template.html | Template file

libraries/botbuilder-applicationinsights/django_tests/all_tests.sh

@@ -11,7 +11,7 @@ BASEDIR=$(pwd)
 
 # Django/python compatibility matrix...
 if $PYTHON -c "import sys; sys.exit(1 if (sys.version_info.major == 3 and sys.version_info.minor == 6) else 0)"; then
-    echo "[Error] Environment should be configured with Python 3.6!" 1>&2
+    echo "[Error] Environment should be configured with Python 3.7!" 1>&2
 	exit 2
 fi
 # Add more versions here (space delimited).

libraries/botbuilder-applicationinsights/setup.py

@@ -24,21 +24,25 @@
     info = f.read()
     exec(info, package_info)
 
+with open(os.path.join(root, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
 setup(
     name=package_info['__title__'],
     version=package_info['__version__'],
     url=package_info['__uri__'],
     author=package_info['__author__'],
     description=package_info['__description__'],
     keywords=['BotBuilderApplicationInsights', 'bots', 'ai', 'botframework', 'botbuilder'],
-    long_description=package_info['__summary__'],
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
     license=package_info['__license__'],
     packages=['botbuilder.applicationinsights','botbuilder.applicationinsights.django' ],
     install_requires=REQUIRES + TESTS_REQUIRES,
     tests_require=TESTS_REQUIRES,
     include_package_data=True,
     classifiers=[
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',

libraries/botbuilder-azure/README.rst

@@ -0,0 +1,83 @@
+
+===============================
+BotBuilder-Azure SDK for Python
+===============================
+
+.. image:: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI?branchName=master
+   :target:  https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI
+   :align: right
+   :alt: Azure DevOps status for master branch
+.. image:: https://badge.fury.io/py/botbuilder-dialogs.svg
+   :target: https://badge.fury.io/py/botbuilder-dialogs
+   :alt: Latest PyPI package version
+
+Azure extensions for Microsoft BotBuilder.
+
+How to Install
+==============
+
+.. code-block:: python
+
+  pip install botbuilder-azure
+
+
+Documentation/Wiki
+==================
+
+You can find more information on the botbuilder-python project by visiting our `Wiki`_.
+
+Requirements
+============
+
+* `Python >= 3.7.3`_
+
+
+Source Code
+===========
+The latest developer version is available in a github repository:
+https://github.com/Microsoft/botbuilder-python/
+
+
+Contributing
+============
+
+This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
+the rights to use your contribution. For details, visit https://cla.microsoft.com.
+
+When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
+a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
+provided by the bot. You will only need to do this once across all repos using our CLA.
+
+This project has adopted the `Microsoft Open Source Code of Conduct`_.
+For more information see the `Code of Conduct FAQ`_ or
+contact `[email protected]`_ with any additional questions or comments.
+
+Reporting Security Issues
+=========================
+
+Security issues and bugs should be reported privately, via email, to the Microsoft Security
+Response Center (MSRC) at `[email protected]`_. You should
+receive a response within 24 hours. If for some reason you do not, please follow up via
+email to ensure we received your original message. Further information, including the
+`MSRC PGP`_ key, can be found in
+the `Security TechCenter`_.
+
+License
+=======
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the MIT_ License.
+
+.. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
+.. _Python >= 3.7.3: https://www.python.org/downloads/
+.. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
+.. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
+.. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/
+.. [email protected]: mailto:[email protected]
+.. [email protected]: mailto:[email protected]
+.. _MSRC PGP: https://technet.microsoft.com/en-us/security/dn606155
+.. _Security TechCenter: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
+
+.. <https://technet.microsoft.com/en-us/security/default>`_

libraries/botbuilder-azure/setup.py

@@ -16,6 +16,9 @@
     info = f.read()
     exec(info, package_info)
 
+with open(os.path.join(root, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
 setup(
     name=package_info['__title__'],
     version=package_info['__version__'],
@@ -24,13 +27,14 @@
     description=package_info['__description__'],
     keywords=['BotBuilderAzure', 'bots', 'ai',
               'botframework', 'botbuilder', 'azure'],
-    long_description=package_info['__summary__'],
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
     license=package_info['__license__'],
     packages=['botbuilder.azure'],
     install_requires=REQUIRES + TEST_REQUIRES,
     tests_require=TEST_REQUIRES,
     classifiers=[
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',

libraries/botbuilder-core/README.rst

@@ -1,7 +1,7 @@
 
-==================================
+==============================
 BotBuilder-Core SDK for Python
-==================================
+==============================
 
 .. image:: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI?branchName=master
    :target:  https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI
@@ -29,7 +29,7 @@ You can find more information on the botbuilder-python project by visiting our `
 Requirements
 ============
 
-* `Python >= 3.6.4`_
+* `Python >= 3.7.3`_
 
 
 Source Code
@@ -71,7 +71,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 Licensed under the MIT_ License.
 
 .. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
-.. _Python >= 3.6.4: https://www.python.org/downloads/
+.. _Python >= 3.7.3: https://www.python.org/downloads/
 .. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
 .. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
 .. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/

libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py

@@ -181,9 +181,9 @@ async def update_activity(self, context: TurnContext, activity: Activity):
         """
         try:
             client = self.create_connector_client(activity.service_url)
-            return await client.conversations.update_activity(
+            return client.conversations.update_activity(
                 activity.conversation.id,
-                activity.conversation.activity_id,
+                activity.id,
                 activity)
         except Exception as e:
             raise e

libraries/botbuilder-core/botbuilder/core/bot_state.py

@@ -3,7 +3,7 @@
 
 from .turn_context import TurnContext
 from .middleware_set import Middleware
-from .storage import calculate_change_hash, StoreItem, StorageKeyFactory, Storage
+from .storage import calculate_change_hash, StorageKeyFactory, Storage
 from .property_manager import PropertyManager
 from botbuilder.core.state_property_accessor import StatePropertyAccessor
 from botbuilder.core import turn_context

libraries/botbuilder-core/setup.py

@@ -16,19 +16,23 @@
     info = f.read()
     exec(info, package_info)
 
+with open(os.path.join(root, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
 setup(
     name=package_info['__title__'],
     version=package_info['__version__'],
     url=package_info['__uri__'],
     author=package_info['__author__'],
     description=package_info['__description__'],
     keywords=['BotBuilderCore', 'bots', 'ai', 'botframework', 'botbuilder'],
-    long_description=package_info['__summary__'],
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
     license=package_info['__license__'],
     packages=['botbuilder.core', 'botbuilder.core.adapters'],
     install_requires=REQUIRES,
     classifiers=[
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',