8000 Merge branch 'master' into axsuarez/echo-bot-sample · baruchiro/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'

0 commit comments

Comments
 (0)
0