From 7d744b0d78a7dda24449cc6fa97d99d8a2a5cc34 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Fri, 31 Jan 2020 09:38:22 -0600 Subject: [PATCH 1/2] Sets version on Python libs --- .../botbuilder-ai/botbuilder/ai/about.py | 28 +++---- .../botbuilder/applicationinsights/about.py | 2 +- .../botbuilder/azure/about.py | 28 +++---- .../botbuilder-core/botbuilder/core/about.py | 28 +++---- ...tp_channel_service_exception_middleware.py | 2 +- libraries/botbuilder-core/setup.py | 2 +- .../botbuilder/dialogs/about.py | 28 +++---- libraries/botbuilder-schema/setup.py | 74 +++++++++---------- .../botbuilder/testing/about.py | 30 ++++---- libraries/botframework-connector/setup.py | 2 +- 10 files changed, 112 insertions(+), 112 deletions(-) diff --git a/libraries/botbuilder-ai/botbuilder/ai/about.py b/libraries/botbuilder-ai/botbuilder/ai/about.py index 96d47800b..2fe559dac 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/about.py +++ b/libraries/botbuilder-ai/botbuilder/ai/about.py @@ -1,14 +1,14 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -import os - -__title__ = "botbuilder-ai" -__version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1" -) -__uri__ = "https://www.github.com/Microsoft/botbuilder-python" -__author__ = "Microsoft" -__description__ = "Microsoft Bot Framework Bot Builder" -__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." -__license__ = "MIT" +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +import os + +__title__ = "botbuilder-ai" +__version__ = ( + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" +) +__uri__ = "https://www.github.com/Microsoft/botbuilder-python" +__author__ = "Microsoft" +__description__ = "Microsoft Bot Framework Bot Builder" +__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." +__license__ = "MIT" diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py index bae8313bf..4c5006f5f 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.4.0b1" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-azure/botbuilder/azure/about.py b/libraries/botbuilder-azure/botbuilder/azure/about.py index 94b912127..a2276b583 100644 --- a/libraries/botbuilder-azure/botbuilder/azure/about.py +++ b/libraries/botbuilder-azure/botbuilder/azure/about.py @@ -1,14 +1,14 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -import os - -__title__ = "botbuilder-azure" -__version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1" -) -__uri__ = "https://www.github.com/Microsoft/botbuilder-python" -__author__ = "Microsoft" -__description__ = "Microsoft Bot Framework Bot Builder" -__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." -__license__ = "MIT" +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +import os + +__title__ = "botbuilder-azure" +__version__ = ( + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" +) +__uri__ = "https://www.github.com/Microsoft/botbuilder-python" +__author__ = "Microsoft" +__description__ = "Microsoft Bot Framework Bot Builder" +__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." +__license__ = "MIT" diff --git a/libraries/botbuilder-core/botbuilder/core/about.py b/libraries/botbuilder-core/botbuilder/core/about.py index 6ec169c3a..f47c7fd78 100644 --- a/libraries/botbuilder-core/botbuilder/core/about.py +++ b/libraries/botbuilder-core/botbuilder/core/about.py @@ -1,14 +1,14 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -import os - -__title__ = "botbuilder-core" -__version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1" -) -__uri__ = "https://www.github.com/Microsoft/botbuilder-python" -__author__ = "Microsoft" -__description__ = "Microsoft Bot Framework Bot Builder" -__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." -__license__ = "MIT" +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +import os + +__title__ = "botbuilder-core" +__version__ = ( + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" +) +__uri__ = "https://www.github.com/Microsoft/botbuilder-python" +__author__ = "Microsoft" +__description__ = "Microsoft Bot Framework Bot Builder" +__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." +__license__ = "MIT" diff --git a/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py b/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py index 7c5091121..415f6a077 100644 --- a/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py +++ b/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py @@ -25,5 +25,5 @@ async def aiohttp_error_middleware(request, handler): raise HTTPUnauthorized() except KeyError: raise HTTPNotFound() - except Exception: + except Exception as error: raise HTTPInternalServerError() diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index 1ce1a0e39..21a356b49 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -4,7 +4,7 @@ import os from setuptools import setup -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" REQUIRES = [ "botbuilder-schema>=4.7.1", "botframework-connector>=4.7.1", diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py index f8c29f033..2f0ceb142 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py @@ -1,14 +1,14 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -import os - -__title__ = "botbuilder-dialogs" -__version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1" -) -__uri__ = "https://www.github.com/Microsoft/botbuilder-python" -__author__ = "Microsoft" -__description__ = "Microsoft Bot Framework Bot Builder" -__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." -__license__ = "MIT" +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +import os + +__title__ = "botbuilder-dialogs" +__version__ = ( + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" +) +__uri__ = "https://www.github.com/Microsoft/botbuilder-python" +__author__ = "Microsoft" +__description__ = "Microsoft Bot Framework Bot Builder" +__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." +__license__ = "MIT" diff --git a/libraries/botbuilder-schema/setup.py b/libraries/botbuilder-schema/setup.py index a7fc298b2..bb183e091 100644 --- a/libraries/botbuilder-schema/setup.py +++ b/libraries/botbuilder-schema/setup.py @@ -1,37 +1,37 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -import os -from setuptools import setup - -NAME = "botbuilder-schema" -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1" -REQUIRES = ["msrest==0.6.10"] - -root = os.path.abspath(os.path.dirname(__file__)) - -with open(os.path.join(root, "README.rst"), encoding="utf-8") as f: - long_description = f.read() - -setup( - name=NAME, - version=VERSION, - description="BotBuilder Schema", - author="Microsoft", - url="https://github.com/Microsoft/botbuilder-python", - keywords=["BotBuilderSchema", "bots", "ai", "botframework", "botbuilder"], - long_description=long_description, - long_description_content_type="text/x-rst", - license="MIT", - install_requires=REQUIRES, - packages=["botbuilder.schema", "botbuilder.schema.teams",], - include_package_data=True, - classifiers=[ - "Programming Language :: Python :: 3.7", - "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - "Development Status :: 5 - Production/Stable", - "Topic :: Scientific/Engineering :: Artificial Intelligence", - ], -) +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +import os +from setuptools import setup + +NAME = "botbuilder-schema" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" +REQUIRES = ["msrest==0.6.10"] + +root = os.path.abspath(os.path.dirname(__file__)) + +with open(os.path.join(root, "README.rst"), encoding="utf-8") as f: + long_description = f.read() + +setup( + name=NAME, + version=VERSION, + description="BotBuilder Schema", + author="Microsoft", + url="https://github.com/Microsoft/botbuilder-python", + keywords=["BotBuilderSchema", "bots", "ai", "botframework", "botbuilder"], + long_description=long_description, + long_description_content_type="text/x-rst", + license="MIT", + install_requires=REQUIRES, + packages=["botbuilder.schema", "botbuilder.schema.teams",], + include_package_data=True, + classifiers=[ + "Programming Language :: Python :: 3.7", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Development Status :: 5 - Production/Stable", + "Topic :: Scientific/Engineering :: Artificial Intelligence", + ], +) diff --git a/libraries/botbuilder-testing/botbuilder/testing/about.py b/libraries/botbuilder-testing/botbuilder/testing/about.py index d44f889b1..09585f325 100644 --- a/libraries/botbuilder-testing/botbuilder/testing/about.py +++ b/libraries/botbuilder-testing/botbuilder/testing/about.py @@ -1,15 +1,15 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -import os - - -__title__ = "botbuilder-testing" -__version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1" -) -__uri__ = "https://www.github.com/Microsoft/botbuilder-python" -__author__ = "Microsoft" -__description__ = "Microsoft Bot Framework Bot Builder" -__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." -__license__ = "MIT" +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +import os + + +__title__ = "botbuilder-testing" +__version__ = ( + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" +) +__uri__ = "https://www.github.com/Microsoft/botbuilder-python" +__author__ = "Microsoft" +__description__ = "Microsoft Bot Framework Bot Builder" +__summary__ = "Microsoft Bot Framework Bot Builder SDK for Python." +__license__ = "MIT" diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 7855654a6..6c2b30e16 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -4,7 +4,7 @@ from setuptools import setup NAME = "botframework-connector" -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1" REQUIRES = [ "msrest==0.6.10", "requests==2.22.0", From 9c438870007289dc622aecdab568c62b2f800de8 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Fri, 31 Jan 2020 10:43:15 -0800 Subject: [PATCH 2/2] pylint: Sets version on Python libs --- .../integration/aiohttp_channel_service_exception_middleware.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py b/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py index 415f6a077..7c5091121 100644 --- a/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py +++ b/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py @@ -25,5 +25,5 @@ async def aiohttp_error_middleware(request, handler): raise HTTPUnauthorized() except KeyError: raise HTTPNotFound() - except Exception as error: + except Exception: raise HTTPInternalServerError()