8000 Merge branch 'master' into axsuarez/echo-bot-sample · rsliang/botbuilder-python@b3542b6 · GitHub
[go: up one dir, main page]
Skip to content

Commit b3542b6

Browse files
axelsrzaxelsrz
authored
Merge branch 'master' into axsuarez/echo-bot-sample
2 parents 7ee0eaf + 44d910b commit b3542b6

File tree

52 files changed

+371
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+371
-49
lines changed

‎Generator/generator-botbuilder-python/generators/app/templates/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
git+https://github.com/Azure/msrest-for-python@async2
2-
botbuilder-core>=4.0.0.a3
2+
botbuilder-core>=4.4.0b1
33
aiohttp>=3.0.0

‎libraries/botbuilder-ai/botbuilder/ai/about.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55

66
__title__ = 'botbuilder-ai'
7-
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.0.0.a6"
7+
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1"
88
__uri__ = 'https://www.github.com/Microsoft/botbuilder-python'
99
__author__ = 'Microsoft'
1010
__description__ = 'Microsoft Bot Framework Bot Builder'

‎libraries/botbuilder-ai/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
msrest>=0.6.6
2-
botbuilder-schema>=4.0.0.a6
3-
botbuilder-core>=4.0.0.a6
2+
botbuilder-schema>=4.4.0b1
3+
botbuilder-core>=4.4.0b1
44
requests>=2.18.1
55
aiounittest>=1.1.0
66
azure-cognitiveservices-language-luis>=0.2.0

‎libraries/botbuilder-ai/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
REQUIRES = [
88
"azure-cognitiveservices-language-luis==0.2.0",
9-
"botbuilder-schema>=4.0.0.a6",
10-
"botbuilder-core>=4.0.0.a6",
9+
"botbuilder-schema>=4.4.0b1",
10+
"botbuilder-core>=4.4.0b1",
1111
"aiohttp>=3.5.4"
1212
]
1313

@@ -32,7 +32,7 @@
3232
long_description=package_info["__summary__"],
3333
license=package_info["__license__"],
3434
packages=["botbuilder.ai", "botbuilder.ai.qna", "botbuilder.ai.luis"],
35-
install_requires=REQUIRES,
35+
install_requires=REQUIRES + TESTS_REQUIRES,
3636
tests_require=TESTS_REQUIRES,
3737
include_package_data=True,
3838
classifiers=[

‎libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55

66
__title__ = 'botbuilder-applicationinsights'
7-
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.0.0.a6"
7+
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1"
88
__uri__ = 'https://www.github.com/Microsoft/botbuilder-python'
99
__author__ = 'Microsoft'
1010
__description__ = 'Microsoft Bot Framework Bot Builder'

‎libraries/botbuilder-applicationinsights/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
msrest>=0.6.6
2-
botbuilder-core>=4.0.0.a6
2+
botbuilder-core>=4.4.0b1
33
aiounittest>=1.1.0

‎libraries/botbuilder-applicationinsights/setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
REQUIRES = [
88
'applicationinsights>=0.11.9',
9-
'botbuilder-schema>=4.0.0.a6',
10-
'botframework-connector>=4.0.0.a6',
11-
'botbuilder-core>=4.0.0.a6'
9+
'botbuilder-schema>=4.4.0b1',
10+
'botframework-connector>=4.4.0b1',
11+
'botbuilder-core>=4.4.0b1'
1212
]
1313
TESTS_REQUIRES = [
1414
'aiounittest>=1.1.0',
@@ -34,7 +34,7 @@
3434
long_description=package_info['__summary__'],
3535
license=package_info['__license__'],
3636
packages=['botbuilder.applicationinsights','botbuilder.applicationinsights.django' ],
37-
install_requires=REQUIRES,
37+
install_requires=REQUIRES + TESTS_REQUIRES,
3838
tests_require=TESTS_REQUIRES,
3939
include_package_data=True,
4040
classifiers=[

‎libraries/botbuilder-azure/botbuilder/azure/about.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55

66
__title__ = 'botbuilder-azure'
7-
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.0.0.a6"
7+
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1"
88
__uri__ = 'https://www.github.com/Microsoft/botbuilder-python'
99
__author__ = 'Microsoft'
1010
__description__ = 'Microsoft Bot Framework Bot Builder'

‎libraries/botbuilder-azure/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from setuptools import setup
66

77
REQUIRES = ['azure-cosmos>=3.0.0',
8-
'botbuilder-schema>=4.0.0.a6',
9-
'botframework-connector>=4.0.0.a6']
8+
'botbuilder-schema>=4.4.0b1',
9+
'botframework-connector>=4.4.0b1']
1010
TEST_REQUIRES = ['aiounittest>=1.1.0']
1111

1212
root = os.path.abspath(os.path.dirname(__file__))

‎libraries/botbuilder-core/botbuilder/core/about.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55

66
__title__ = 'botbuilder-core'
7-
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.0.0.a6"
7+
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1"
88
__uri__ = 'https://www.github.com/Microsoft/botbuilder-python'
99
__author__ = 'Microsoft'
1010
__description__ = 'Microsoft Bot Framework Bot Builder'

‎libraries/botbuilder-core/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
msrest>=0.6.6
2-
botframework-connector>=4.0.0.a6
3-
botbuilder-schema>=4.0.0.a6
2+
botframework-connector>=4.4.0b1
3+
botbuilder-schema>=4.4.0b1
44
requests>=2.18.1
55
PyJWT==1.5.3
66
cryptography==2.1.4

‎libraries/botbuilder-core/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import os
55
from setuptools import setup
66

7-
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.0.0.a6"
7+
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1"
88
REQUIRES = [
9-
'botbuilder-schema>=4.0.0.a6',
10-
'botframework-connector>=4.0.0.a6']
9+
'botbuilder-schema>=4.4.0b1',
10+
'botframework-connector>=4.4.0b1']
1111

1212
root = os.path.abspath(os.path.dirname(__file__))
1313

‎libraries/botbuilder-dialogs/botbuilder/dialogs/about.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55

66
__title__ = 'botbuilder-dialogs'
7-
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.0.0.a6"
7+
__version__ = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1"
88
__uri__ = 'https://www.github.com/Microsoft/botbuilder-python'
99
__author__ = 'Microsoft'
1010
__description__ = 'Microsoft Bot Framework Bot Builder'

‎libraries/botbuilder-dialogs/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
msrest>=0.6.6
2-
botframework-connector>=4.0.0.a6
3-
botbuilder-schema>=4.0.0.a6
4-
botbuilder-core>=4.0.0.a6
2+
botframework-connector>=4.4.0b1
3+
botbuilder-schema>=4.4.0b1
4+
botbuilder-core>=4.4.0b1
55
requests>=2.18.1
66
PyJWT==1.5.3
77
cryptography==2.1.4

‎libraries/botbuilder-dialogs/setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
REQUIRES = [
88
'recognizers-date-time>=1.0.0a1',
99
'recognizers-number-with-unit>=1.0.0a1',
10-
'recognizers-number>=1.0.0a1',
10+
'recognizers-number>=1.0.0a2',
1111
'recognizers-text>=1.0.0a1',
12-
'botbuilder-schema>=4.0.0.a6',
13-
'botframework-connector>=4.0.0.a6',
14-
'botbuilder-core>=4.0.0.a6']
12+
'botbuilder-schema>=4.4.0b1',
13+
'botframework-connector>=4.4.0b1',
14+
'botbuilder-core>=4.4.0b1']
1515

1616
TEST_REQUIRES = [
1717
'aiounittest>=1.1.0'
@@ -34,7 +34,7 @@
3434
long_description=package_info['__summary__'],
3535
license=package_info['__license__'],
3636
packages=['botbuilder.dialogs', 'botbuilder.dialogs.prompts', 'botbuilder.dialogs.choices'],
37-
install_requires=REQUIRES,
37+
install_requires=REQUIRES + TEST_REQUIRES,
3838
tests_require=TEST_REQUIRES,
3939
include_package_data=True,
4040
classifiers=[

‎libraries/botbuilder-schema/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from setuptools import setup
66

77
NAME = "botbuilder-schema"
8-
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.0.0.a6"
8+
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1"
99
REQUIRES = ["msrest>=0.6.6"]
1010

1111
setup(

‎libraries/botframework-connector/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
msrest>=0.6.6
2-
botbuilder-schema>=4.0.0.a6
2+
botbuilder-schema>=4.4.0b1
33
requests>=2.18.1
44
PyJWT==1.5.3
55
cryptography==2.1.4

‎libraries/botframework-connector/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
from setuptools import setup
55

66
NAME = "botframework-connector"
7-
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.0.0.a6"
7+
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.4.0b1"
88
REQUIRES = [
99
"msrest>=0.6.6",
1010
"requests>=2.8.1",
1111
"cryptography>=2.1.4",
1212
"PyJWT>=1.5.3",
13-
"botbuilder-schema>=4.0.0.a6"]
13+
"botbuilder-schema>=4.4.0b1"]
1414

1515
setup(
1616
name=NAME,

‎samples/Console-EchoBot/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ git clone https://github.com/Microsoft/botbuilder-python.git
1414

1515

1616
# Adapters
17-
[Adapters](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0#the-bot-adapter) provide an abstraction for your bot to work with a variety of environments.
17+
[Adapters](https://docs.microsoft.com/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0#the-bot-adapter) provide an abstraction for your bot to work with a variety of environments.
1818

1919
A bot is directed by it's adapter, which can be thought of as the conductor for your bot. The adapter is responsible for directing incoming and outgoing communication, authentication, and so on. The adapter differs based on it's environment (the adapter internally works differently locally versus on Azure) but in each instance it achieves the same goal.
2020

@@ -24,7 +24,7 @@ The bot adapter encapsulates authentication processes and sends activities to an
2424

2525
# Further reading
2626

27-
- [Azure Bot Service Introduction](https://docs.microsoft.com/en-us/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0)
28-
- [Bot basics](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
29-
- [Channels and Bot Connector service](https://docs.microsoft.com/en-us/azure/bot-service/bot-concepts?view=azure-bot-service-4.0)
30-
- [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0)
27+
- [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0)
28+
- [Bot basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
29+
- [Channels and Bot Connector service](https://docs.microsoft.com/azure/bot-service/bot-concepts?view=azure-bot-service-4.0)
30+
- [Activity processing](https://docs.microsoft.com/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0)

‎samples/Console-EchoBot/requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
git+https://github.com/Azure/msrest-for-python.git@a997e97cd926c1eedfe4e5a3a52a637313fbd4e4
2-
botbuilder-core>=4.0.0.a6
1+
asyncio>=3.4.3
2+
botbuilder-core>=4.4.0.b1
3+
botbuilder-schema>=4.4.0.b1
4+
botframework-connector>=4.4.0.b1

0 commit comments

Comments
 (0)
0