10000 Merge branch 'master' into axelsrz/export-oauth · ericmicrofocus/botbuilder-python@9cd64b5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9cd64b5

Browse files
axelsrzaxelsrz
authored
Merge branch 'master' into axelsrz/export-oauth
2 parents d1168bc + c88c539 commit 9cd64b5

File tree

31 files changed

+57
-57
lines changed

31 files changed

+57
-57
lines changed

‎libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
__title__ = "botbuilder-adapters-slack"
77
__version__ = (
8-
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
8+
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
99
)
1010
__uri__ = "https://www.github.com/Microsoft/botbuilder-python"
1111
__author__ = "Microsoft"

‎libraries/botbuilder-adapters-slack/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
aiohttp
22
pyslack
3-
botbuilder-core>=4.7.1
3+
botbuilder-core>=4.10.0
44
slackclient

‎libraries/botbuilder-adapters-slack/setup.py

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

77
REQUIRES = [
8-
"botbuilder-schema>=4.7.0",
9-
"botframework-connector>=4.7.0",
10-
"botbuilder-core>=4.7.0",
8+
"botbuilder-schema>=4.10.0",
9+
"botframework-connector>=4.10.0",
10+
"botbuilder-core>=4.10.0",
1111
]
1212

1313
TEST_REQUIRES = ["aiounittest==1.3.0"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
__title__ = "botbuilder-ai"
77
__version__ = (
8-
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
8+
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
99
)
1010
__uri__ = "https://www.github.com/Microsoft/botbuilder-python"
1111
__author__ = "Microsoft"

‎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.10
2-
botbuilder-schema>=4.7.1
3-
botbuilder-core>=4.7.1
2+
botbuilder-schema>=4.10.0
3+
botbuilder-core>=4.10.0
44
requests==2.22.0
55
aiounittest==1.3.0
66
azure-cognitiveservices-language-luis==0.2.0

‎libraries/botbuilder-ai/setup.py

Lines changed: 2 additions & 2 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.7.1",
10-
"botbuilder-core>=4.7.1",
9+
"botbuilder-schema>=4.10.0",
10+
"botbuilder-core>=4.10.0",
1111
"aiohttp==3.6.2",
1212
]
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
__title__ = "botbuilder-applicationinsights"
88
__version__ = (
9-
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
9+
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
1010
)
1111
__uri__ = "https://www.github.com/Microsoft/botbuilder-python"
1212
__author__ = "Microsoft"

‎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.10
2-
botbuilder-core>=4.7.1
2+
botbuilder-core>=4.10.0
33
aiounittest==1.3.0

‎libraries/botbuilder-applicationinsights/setup.py

Lines changed: 3 additions & 3 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.7.1",
10-
"botframework-connector>=4.7.1",
11-
"botbuilder-core>=4.7.1",
9+
"botbuilder-schema>=4.10.0",
10+
"botframework-connector>=4.10.0",
11+
"botbuilder-core>=4.10.0",
1212
]
1313
TESTS_REQUIRES = [
1414
"aiounittest==1.3.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
__title__ = "botbuilder-azure"
77
__version__ = (
8-
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
8+
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
99
)
1010
__uri__ = "https://www.github.com/Microsoft/botbuilder-python"
1111
__author__ = "Microsoft"

‎libraries/botbuilder-azure/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
REQUIRES = [
88
"azure-cosmos==3.1.2",
99
"azure-storage-blob==2.1.0",
10-
"botbuilder-schema>=4.7.1",
11-
"botframework-connector>=4.7.1",
10+
"botbuilder-schema>=4.10.0",
11+
"botframework-connector>=4.10.0",
1212
"jsonpickle==1.2",
1313
]
1414
TEST_REQUIRES = ["aiounittest==1.3.0"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
__title__ = "botbuilder-core"
77
__version__ = (
8-
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
8+
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
99
)
1010
__uri__ = "https://www.github.com/Microsoft/botbuilder-python"
1111
__author__ = "Microsoft"

‎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.10
2-
botframework-connector>=4.7.1
3-
botbuilder-schema>=4.7.1
2+
botframework-connector>=4.10.0
3+
botbuilder-schema>=4.10.0
44
requests==2.22.0
55
PyJWT==1.5.3
66
cryptography==2.8.0

‎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.7.1"
7+
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
88
REQUIRES = [
9-
"botbuilder-schema>=4.7.1",
10-
"botframework-connector>=4.7.1",
9+
"botbuilder-schema>=4.10.0",
10+
"botframework-connector>=4.10.0",
1111
"jsonpickle==1.2",
1212
]
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
__title__ = "botbuilder-dialogs"
77
__version__ = (
8-
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
8+
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
99
)
1010
__uri__ = "https://www.github.com/Microsoft/botbuilder-python"
1111
__author__ = "Microsoft"

‎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.10
2-
botframework-connector>=4.7.1
3-
botbuilder-schema>=4.7.1
4-
botbuilder-core>=4.7.1
2+
botframework-connector>=4.10.0
3+
botbuilder-schema>=4.10.0
4+
botbuilder-core>=4.10.0
55
requests==2.22.0
66
PyJWT==1.5.3
77
cryptography==2.8

‎libraries/botbuilder-dialogs/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"recognizers-text>=1.0.2a1",
1313
"recognizers-text-choice>=1.0.2a1",
1414
"babel==2.7.0",
15-
"botbuilder-schema>=4.7.1",
16-
"botframework-connector>=4.7.1",
17-
"botbuilder-core>=4.7.1",
15+
"botbuilder-schema>=4.10.0",
16+
"botframework-connector>=4.10.0",
17+
"botbuilder-core>=4.10.0",
1818
]
1919

2020
TEST_REQUIRES = ["aiounittest==1.3.0"]

‎libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/about.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
__title__ = "botbuilder-integration-aiohttp"
77
__version__ = (
8-
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
8+
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
99
)
1010
__uri__ = "https://www.github.com/Microsoft/botbuilder-python"
1111
__author__ = "Microsoft"

‎libraries/botbuilder-integration-aiohttp/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
msrest==0.6.10
2-
botframework-connector>=4.7.1
3-
botbuilder-schema>=4.7.1
2+
botframework-connector>=4.10.0
3+
botbuilder-schema>=4.10.0
44
aiohttp>=3.6.2

‎libraries/botbuilder-integration-aiohttp/setup.py

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

7-
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
7+
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
88
REQUIRES = [
9-
"botbuilder-schema>=4.7.1",
10-
"botframework-connector>=4.7.1",
11-
"botbuilder-core>=4.7.1",
9+
"botbuilder-schema>=4.10.0",
10+
"botframework-connector>=4.10.0",
11+
"botbuilder-core>=4.10.0",
1212
"aiohttp==3.6.2",
1313
]
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
__title__ = "botbuilder-integration-applicationinsights-aiohttp"
88
__version__ = (
9-
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
9+
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
1010
)
1111
__uri__ = "https://www.github.com/Microsoft/botbuilder-python"
1212
__author__ = "Microsoft"

‎libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
REQUIRES = [
88
"applicationinsights>=0.11.9",
99
"aiohttp==3.6.2",
10-
"botbuilder-schema>=4.7.1",
11-
"botframework-connector>=4.7.1",
12-
"botbuilder-core>=4.7.1",
13-
"botbuilder-applicationinsights>=4.7.1",
10+
"botbuilder-schema>=4.10.0",
11+
"botframework-connector>=4.10.0",
12+
"botbuilder-core>=4.10.0",
13+
"botbuilder-applicationinsights>=4.10.0",
1414
]
1515
TESTS_REQUIRES = [
1616
"aiounittest==1.3.0",

‎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.7.1"
8+
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
99
REQUIRES = ["msrest==0.6.10"]
1010

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
__title__ = "botbuilder-testing"
88
__version__ = (
9-
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.7.1"
9+
os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
1010
)
1111
__uri__ = "https://www.github.com/Microsoft/botbuilder-python"
1212
__author__ = "Microsoft"

‎libraries/botbuilder-testing/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
botbuilder-schema>=4.7.1
2-
botbuilder-core>=4.7.1
3-
botbuilder-dialogs>=4.7.1
1+
botbuilder-schema>=4.10.0
2+
botbuilder-core>=4.10.0
3+
botbuilder-dialogs>=4.10.0
44
aiounittest==1.3.0

‎libraries/botbuilder-testing/setup.py

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

77
REQUIRES = [
8-
"botbuilder-schema>=4.7.1",
9-
"botbuilder-core>=4.7.1",
10-
"botbuilder-dialogs>=4.7.1",
8+
"botbuilder-schema>=4.10.0",
9+
"botbuilder-core>=4.10.0",
10+
"botbuilder-dialogs>=4.10.0",
1111
]
1212

1313
TESTS_REQUIRES = ["aiounittest==1.3.0"]

‎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.10
2-
botbuilder-schema>=4.7.1
2+
botbuilder-schema>=4.10.0
33
requests==2.22.0
44
PyJWT==1.5.3
55
cryptography==2.8.0

‎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.7.1"
7+
VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.10.0"
88
REQUIRES = [
99
"msrest==0.6.10",
1010
"requests==2.22.0",
1111
"cryptography==2.8.0",
1212
"PyJWT==1.5.3",
13-
"botbuilder-schema>=4.7.1",
13+
"botbuilder-schema>=4.10.0",
1414
"adal==1.2.1",
1515
"msal==1.2.0",
1616
]

‎libraries/functional-tests/functionaltestbot/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) Microsoft Corporation. All rights reserved.
22
# Licensed under the MIT License.
33

4-
botbuilder-core>=4.5.0.b4
4+
botbuilder-core>=4.10
55
flask==1.1.1

‎libraries/functional-tests/functionaltestbot/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
REQUIRES = [
8-
"botbuilder-core>=4.5.0.b4",
8+
"botbuilder-core>=4.10",
99
"flask==1.1.1",
1010
]
1111

‎pipelines/botbuilder-python-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variables:
77
COVERALLS_SERVICE_JOB_ID: $(Build.BuildId)
88
COVERALLS_SERVICE_NAME: python-ci
99
python.36: 3.6.10
10-
python.37: 3.7.6
10+
python.37: 3.7.7
1111
python.38: 3.8.2
1212
# PythonCoverallsToken: get this from Azure
1313

0 commit comments

Comments
 (0)
0