Skip to content

Commit 5ca3949

Browse files
tsuwandytsuwandy
committed
Merge branch 'master' into tiens
2 parents ee4fca4 + 5c1169c commit 5ca3949

File tree

23 files changed

+291
-65
lines changed

23 files changed

+291
-65
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎libraries/botbuilder-ai/README.rst‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
2+
============================
3+
BotBuilder-AI SDK for Python
4+
============================
5+
6+
.. image:: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI?branchName=master
7+
:target: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI
8+
:align: right
9+
:alt: Azure DevOps status for master branch
10+
.. image:: https://badge.fury.io/py/botbuilder-ai.svg
11+
:target: https://badge.fury.io/py/botbuilder-ai
12+
:alt: Latest PyPI package version
13+
14+
Cognitive services extensions for Microsoft BotBuilder.
15+
16+
17+
How to Install
18+
==============
19+
20+
.. code-block:: python
21+
22+
pip install botbuilder-ai
23+
24+
25+
Documentation/Wiki
26+
==================
27+
28+
You can find more information on the botbuilder-python project by visiting our `Wiki`_.
29+
30+
Requirements
31+
============
32+
33+
* `Python >= 3.7.0`_
34+
35+
36+
Source Code
37+
===========
38+
The latest developer version is available in a github repository:
39+
https://github.com/Microsoft/botbuilder-python/
40+
41+
42+
Contributing
43+
============
44+
45+
This project welcomes contributions and suggestions. Most contributions require you to agree to a
46+
Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
47+
the rights to use your contribution. For details, visit https://cla.microsoft.com.
48+
49+
When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
50+
a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
51+
provided by the bot. You will only need to do this once across all repos using our CLA.
52+
53+
This project has adopted the `Microsoft Open Source Code of Conduct`_.
54+
For more information see the `Code of Conduct FAQ`_ or
55+
contact `[email protected]`_ with any additional questions or comments.
56+
57+
Reporting Security Issues
58+
=========================
59+
60+
Security issues and bugs should be reported privately, via email, to the Microsoft Security
61+
Response Center (MSRC) at `[email protected]`_. You should
62+
receive a response within 24 hours. If for some reason you do not, please follow up via
63+
email to ensure we received your original message. Further information, including the
64+
`MSRC PGP`_ key, can be found in
65+
the `Security TechCenter`_.
66+
67+
License
68+
=======
69+
70+
Copyright (c) Microsoft Corporation. All rights reserved.
71+
72+
Licensed under the MIT_ License.
73+
74+
.. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
75+
.. _Python >= 3.7.0: https://www.python.org/downloads/
76+
.. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
77+
.. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
78+
.. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/
79+
.. _[email protected]: mailto:[email protected]
80+
.. _[email protected]: mailto:[email protected]
81+
.. _MSRC PGP: https://technet.microsoft.com/en-us/security/dn606155
82+
.. _Security TechCenter: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
83+
84+
.. <https://technet.microsoft.com/en-us/security/default>`_

‎libraries/botbuilder-ai/setup.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,25 @@
2222
info = f.read()
2323
exec(info, package_info)
2424

25+
with open(os.path.join(root, 'README.rst'), encoding='utf-8') as f:
26+
long_description = f.read()
27+
2528
setup(
2629
name=package_info["__title__"],
2730
version=package_info["__version__"],
2831
url=package_info["__uri__"],
2932
author=package_info["__author__"],
3033
description=package_info["__description__"],
3134
keywords="botbuilder-ai LUIS QnAMaker bots ai botframework botbuilder",
32-
long_description=package_info["__summary__"],
35+
long_description=long_description,
36+
long_description_content_type='text/x-rst',
3337
license=package_info["__license__"],
3438
packages=["botbuilder.ai", "botbuilder.ai.qna", "botbuilder.ai.luis"],
3539
install_requires=REQUIRES + TESTS_REQUIRES,
3640
tests_require=TESTS_REQUIRES,
3741
include_package_data=True,
3842
classifiers=[
39-
"Programming Language :: Python :: 3.6",
43+
"Programming Language :: Python :: 3.7",
4044
"Intended Audience :: Developers",
4145
"License :: OSI Approved :: MIT License",
4246
"Operating System :: OS Independent",

‎libraries/botbuilder-applicationinsights/README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ BotBuilder-ApplicationInsights SDK for Python
77
:target: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI
88
:align: right
99
:alt: Azure DevOps status for master branch
10-
.. image:: https://badge.fury.io/py/botbuilder-core.svg
11-
:target: https://badge.fury.io/py/botbuilder-core
10+
.. image:: https://badge.fury.io/py/botbuilder-applicationinsights.svg
11+
:target: https://badge.fury.io/py/botbuilder-applicationinsights
1212
:alt: Latest PyPI package version
1313

1414
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 `
3333
Requirements
3434
============
3535

36-
* `Python >= 3.6.8`_
36+
* `Python >= 3.7.0`_
3737

3838

3939
Source Code
@@ -75,7 +75,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
7575
Licensed under the MIT_ License.
7676

7777
.. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
78-
.. _Python >= 3.6.8: https://www.python.org/downloads/
78+
.. _Python >= 3.7.0: https://www.python.org/downloads/
7979
.. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
8080
.. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
8181
.. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/

‎libraries/botbuilder-applicationinsights/django_tests/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Django generates *code* to create projects (`django-admin startproject`) and app
99

1010
File | | Description
1111
--- | ---
12-
all_tests.sh | Runs our current test matrix of python/django versions. Current matrix is python (3.6) and django (2.2).
12+
all_tests.sh | Runs our current test matrix of python/django versions. Current matrix is python (3.7) and django (2.2).
1313
README.md | This file.
1414
run_test.sh | Runs specific python/django version to create project, copy replacement files and runs tests.
1515
template.html | Template file

‎libraries/botbuilder-applicationinsights/django_tests/all_tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BASEDIR=$(pwd)
1111

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

‎libraries/botbuilder-applicationinsights/setup.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,25 @@
2424
info = f.read()
2525
exec(info, package_info)
2626

27+
with open(os.path.join(root, 'README.rst'), encoding='utf-8') as f:
28+
long_description = f.read()
29+
2730
setup(
2831
name=package_info['__title__'],
2932
version=package_info['__version__'],
3033
url=package_info['__uri__'],
3134
author=package_info['__author__'],
3235
description=package_info['__description__'],
3336
keywords=['BotBuilderApplicationInsights', 'bots', 'ai', 'botframework', 'botbuilder'],
34-
long_description=package_info['__summary__'],
37+
long_description=long_description,
38+
long_description_content_type='text/x-rst',
3539
license=package_info['__license__'],
3640
packages=['botbuilder.applicationinsights','botbuilder.applicationinsights.django' ],
3741
install_requires=REQUIRES + TESTS_REQUIRES,
3842
tests_require=TESTS_REQUIRES,
3943
include_package_data=True,
4044
classifiers=[
41-
'Programming Language :: Python :: 3.6',
45+
'Programming Language :: Python :: 3.7',
4246
'Intended Audience :: Developers',
4347
'License :: OSI Approved :: MIT License',
4448
'Operating System :: OS Independent',

‎libraries/botbuilder-azure/README.rst‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
2+
===============================
3+
BotBuilder-Azure SDK for Python
4+
===============================
5+
6+
.. image:: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI?branchName=master
7+
:target: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI
8+
:align: right
9+
:alt: Azure DevOps status for master branch
10+
.. image:: https://badge.fury.io/py/botbuilder-dialogs.svg
11+
:target: https://badge.fury.io/py/botbuilder-dialogs
12+
:alt: Latest PyPI package version
13+
14+
Azure extensions for Microsoft BotBuilder.
15+
16+
How to Install
17+
==============
18+
19+
.. code-block:: python
20+
21+
pip install botbuilder-azure
22+
23+
24+
Documentation/Wiki
25+
==================
26+
27+
You can find more information on the botbuilder-python project by visiting our `Wiki`_.
28+
29+
Requirements
30+
============
31+
32+
* `Python >= 3.7.0`_
33+
34+
35+
Source Code
36+
===========
37+
The latest developer version is available in a github repository:
38+
https://github.com/Microsoft/botbuilder-python/
39+
40+
41+
Contributing
42+
============
43+
44+
This project welcomes contributions and suggestions. Most contributions require you to agree to a
45+
Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
46+
the rights to use your contribution. For details, visit https://cla.microsoft.com.
47+
48+
When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
49+
a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
50+
provided by the bot. You will only need to do this once across all repos using our CLA.
51+
52+
This project has adopted the `Microsoft Open Source Code of Conduct`_.
53+
For more information see the `Code of Conduct FAQ`_ or
54+
contact `[email protected]`_ with any additional questions or comments.
55+
56+
Reporting Security Issues
57+
=========================
58+
59+
Security issues and bugs should be reported privately, via email, to the Microsoft Security
60+
Response Center (MSRC) at `[email protected]`_. You should
61+
receive a response within 24 hours. If for some reason you do not, please follow up via
62+
email to ensure we received your original message. Further information, including the
63+
`MSRC PGP`_ key, can be found in
64+
the `Security TechCenter`_.
65+
66+
License
67+
=======
68+
69+
Copyright (c) Microsoft Corporation. All rights reserved.
70+
71+
Licensed under the MIT_ License.
72+
73+
.. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
74+
.. _Python >= 3.7.0: https://www.python.org/downloads/
75+
.. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
76+
.. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
77+
.. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/
78+
.. _[email protected]: mailto:[email protected]
79+
.. _[email protected]: mailto:[email protected]
80+
.. _MSRC PGP: https://technet.microsoft.com/en-us/security/dn606155
81+
.. _Security TechCenter: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
82+
83+
.. <https://technet.microsoft.com/en-us/security/default>`_

‎libraries/botbuilder-azure/setup.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
info = f.read()
1717
exec(info, package_info)
1818

19+
with open(os.path.join(root, 'README.rst'), encoding='utf-8') as f:
20+
long_description = f.read()
21+
1922
setup(
2023
name=package_info['__title__'],
2124
version=package_info['__version__'],
@@ -24,13 +27,14 @@
2427
description=package_info['__description__'],
2528
keywords=['BotBuilderAzure', 'bots', 'ai',
2629
'botframework', 'botbuilder', 'azure'],
27-
long_description=package_info['__summary__'],
30+
long_description=long_description,
31+
long_description_content_type='text/x-rst',
2832
license=package_info['__license__'],
2933
packages=['botbuilder.azure'],
3034
install_requires=REQUIRES + TEST_REQUIRES,
3135
tests_require=TEST_REQUIRES,
3236
classifiers=[
33-
'Programming Language :: Python :: 3.6',
37+
'Programming Language :: Python :: 3.7',
3438
'Intended Audience :: Developers',
3539
'License :: OSI Approved :: MIT License',
3640
'Operating System :: OS Independent',

‎libraries/botbuilder-core/README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
==================================
2+
==============================
33
BotBuilder-Core SDK for Python
4-
==================================
4+
==============================
55

66
.. image:: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI?branchName=master
77
: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 `
2929
Requirements
3030
============
3131

32-
* `Python >= 3.6.4`_
32+
* `Python >= 3.7.0`_
3333

3434

3535
Source Code
@@ -71,7 +71,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
7171
Licensed under the MIT_ License.
7272

7373
.. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
74-
.. _Python >= 3.6.4: https://www.python.org/downloads/
74+
.. _Python >= 3.7.0: https://www.python.org/downloads/
7575
.. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
7676
.. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
7777
.. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/

0 commit comments

Comments
 (0)