Skip to content

Commit 25019b7

Browse files
Merge pull request #1 from microsoft/main
Merge the latest code with my branch
2 parents 37c361d + 5dfcc48 commit 25019b7

File tree

760 files changed

+53450
-23152
lines changed

Some content is hidden

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

760 files changed

+53450
-23152
lines changed

.github/CODEOWNERS

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Lines starting with '#' are comments.
2+
# Each line is a file pattern followed by one or more owners.
3+
4+
# More details are here: https://help.github.com/articles/about-codeowners/
5+
6+
# The '*' pattern is global owners.
7+
8+
# Order is important. The last matching pattern has the most precedence.
9+
# The folders are ordered as follows:
10+
11+
# In each subsection folders are ordered first by depth, then alphabetically.
12+
# This should make it easy to add new rules without breaking existing ones.
13+
14+
# Global rule:
15+
* @microsoft/bb-python
16+
17+
# Functional tests
18+
/libraries/functional-tests/** @tracyboehrer
19+
20+
# Adapters
21+
/libraries/botbuilder-adapters-slack/** @tracyboehrer @garypretty
22+
23+
# Platform Integration Libaries (aiohttp)
24+
/libraries/botbuilder-integration-aiohttp/** @microsoft/bb-python-integration
25+
/libraries/botbuilder-integration-applicationinsights-aiohttp/** @microsoft/bb-python-integration @garypretty
26+
27+
# Application Insights/Telemetry
28+
/libraries/botbuilder-applicationinsights/** @axelsrz @garypretty
29+
30+
# AI: LUIS + QnA Maker
31+
/libraries/botbuilder-ai/** @microsoft/bf-cog-services
32+
33+
# Azure (Storage)
34+
/libraries/botbuilder-azure/** @tracyboehrer @EricDahlvang
35+
36+
# Adaptive Dialogs
37+
/libraries/botbuilder-dialogs-*/** @tracyboehrer @microsoft/bf-adaptive
38+
39+
# AdaptiveExpressions & LanguageGeneration libraries
40+
/libraries/adaptive-expressions/** @axelsrz @microsoft/bf-adaptive
41+
/libraries/botbuilder-lg/** @axelsrz @microsoft/bf-adaptive
42+
43+
# BotBuilder Testing
44+
/libraries/botbuilder-testing/** @axelsrz @gabog
45+
46+
# Streaming library
47+
/libraries/botbuilder-streaming/** @microsoft/bf-streaming
48+
49+
# BotBuilder library
50+
/libraries/botbuilder-core/** @axelsrz @gabog @johnataylor
51+
52+
# BotBuilder Dialogs
53+
/libraries/botbuilder-dialogs/** @microsoft/bf-dialogs
54+
55+
# Swagger
56+
/libraries/swagger/** @axelsrz @EricDahlvang
57+
58+
# Bot Framework Schema
59+
/libraries/botbuilder-schema/** @EricDahlvang @johnataylor
60+
61+
# Bot Framework connector
62+
libraries\botframework-connector/** @axelsrz @carlosscastro @johnataylor
63+
64+
# Bot Framework Authentication
65+
/libraries/botbuilder-core/botbuilder/core/oauth/** @microsoft/bf-auth
66+
/libraries/botframework-connector/botframework/connector/auth/** @microsoft/bf-auth
67+
68+
# Bot Framework Skills
69+
/libraries/botbuilder-core/botbuilder/core/skills/** @microsoft/bf-skills
70+
/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/skills/** @microsoft/bf-skills
71+
/tests/skills/** @microsoft/bf-skills
72+
73+
# Bot Framework & Microsoft Teams
74+
/libraries/botbuilder-core/botbuilder/core/teams/** @microsoft/bf-teams
75+
/libraries/botbuilder-schema/botbuilder/schema/teams/** @microsoft/bf-teams
76+
/tests/teams/** @microsoft/bf-teams
77+
78+
# Ownership by specific files or file types
79+
# This section MUST stay at the bottom of the CODEOWNERS file. For more information, see
80+
# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#example-of-a-codeowners-file
81+
82+
# Shipped package files
83+
# e.g. READMEs, requirements.txt, setup.py, MANIFEST.in
84+
/libraries/**/README.rst @microsoft/bb-python
85+
/libraries/**/requirements.txt @microsoft/bb-python
86+
/libraries/**/setup.py @microsoft/bb-python
87+
/libraries/**/setup.cfg @microsoft/bb-python
88+
/libraries/**/MANIFEST.in @microsoft/bb-python
89+
90+
# CODEOWNERS
91+
/.github/CODEOWNERS @stevengum @cleemullins @microsoft/bb-python

.github/ISSUE_TEMPLATE/python-sdk-bug.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
---
22
name: Python SDK Bug
33
about: Create a bug report for a bug you found in the Bot Builder Python SDK
4-
4+
title: ""
5+
labels: "needs-triage, bug"
6+
assignees: ""
57
---
68

9+
### [Github issues](https://github.com/Microsoft/botbuilder-python) should be used for bugs and feature requests. Use [Stack Overflow](https://stackoverflow.com/questions/tagged/botframework) for general "how-to" questions.
10+
711
## Version
812
What package version of the SDK are you using.
913

@@ -25,5 +29,3 @@ If applicable, add screenshots to help explain your problem.
2529

2630
## Additional context
2731
Add any other context about the problem here.
28-
29-
[bug]

.github/ISSUE_TEMPLATE/python-sdk-feature-request.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
---
22
name: Python SDK Feature Request
33
about: Suggest a feature for the Bot Builder Python SDK
4-
4+
title: ""
5+
labels: "needs-triage, feature-request"
6+
assignees: ""
57
---
68

9+
### Use this [query](https://github.com/Microsoft/botbuilder-python/issues?q=is%3Aissue+is%3Aopen++label%3Afeature-request+) to search for the most popular feature requests.
10+
711
**Is your feature request related to a problem? Please describe.**
812
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
913

@@ -15,5 +19,3 @@ A clear and concise description of any alternative solutions or features you've
1519

1620
**Additional context**
1721
Add any other context or screenshots about the feature request here.
18-
19-
[enhancement]

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Fixes #<!-- If this addresses a specific issue, please provide the issue number here -->
2+
3+
## Description
4+
<!-- Please discuss the changes you have worked on. What do the changes do; why is this PR needed? -->
5+
6+
## Specific Changes
7+
<!-- Please list the changes in a concise manner. -->
8+
9+
-
10+
-
11+
-
12+
13+
## Testing
14+
<!-- If you are adding a new feature to a library, you must include tests for your new code. -->
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: create-parity-issue.yml
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
prDescription:
7+
description: PR description
8+
default: 'No description provided'
9+
required: true
10+
prNumber:
11+
description: PR number
12+
required: true
13+
prTitle:
14+
description: PR title
15+
required: true
16+
sourceRepo:
17+
description: repository PR is sourced from
18+
required: true
19+
20+
jobs:
21+
createIssue:
22+
name: create issue
23+
runs-on: ubuntu-latest
24+
25+
steps:
26+
- uses: actions/checkout@v2
27+
28+
- uses: joshgummersall/create-issue@main
29+
env:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
with:
32+
title: |
33+
port: ${{ github.event.inputs.prTitle }} (#${{ github.event.inputs.prNumber }})
34+
labels: |
35+
["parity", "needs-triage", "ExemptFromDailyDRIReport"]
36+
body: |
37+
The changes in [${{ github.event.inputs.prTitle }} (#${{ github.event.inputs.prNumber }})](https://github.com/${{ github.event.inputs.sourceRepo }}/pull/${{ github.event.inputs.prNumber }}) may need to be ported to maintain parity with `${{ github.event.inputs.sourceRepo }}`.
38+
39+
<blockquote>
40+
${{ github.event.inputs.prDescription }}
41+
</blockquote>
42+
43+
Please review and, if necessary, port the changes.

.pylintrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extension-pkg-whitelist=
77

88
# Add files or directories to the blacklist. They should be base names, not
99
# paths.
10-
ignore=CVS,build,botbuilder-schema,samples,django_tests,Generator,operations,operations_async
10+
ignore=CVS,build,botbuilder-schema,samples,django_tests,Generator,operations,operations_async,schema
1111

1212
# Add files or directories matching the regex patterns to the blacklist. The
1313
# regex matches against base names, not paths.
@@ -157,7 +157,8 @@ disable=print-statement,
157157
too-many-function-args,
158158
too-many-return-statements,
159159
import-error,
160-
no-name-in-module
160+
no-name-in-module,
161+
too-many-branches
161162

162163
# Enable the message, report, category or checker with the given id(s). You can
163164
# either give multiple identifier separated by comma (,) or put this option

CODE_OF_CONDUCT.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## Code of Conduct
2+
3+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
4+
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact
5+
[opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

Contributing.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Instructions for Contributing Code
2+
3+
## Contributing bug fixes and features
4+
5+
The Bot Framework team is currently accepting contributions in the form of bug fixes and new
6+
features. Any submission must have an issue tracking it in the issue tracker that has
7+
been approved by the Bot Framework team. Your pull request should include a link to
8+
the bug that you are fixing. If you've submitted a PR for a bug, please post a
9+
comment in the bug to avoid duplication of effort.
10+
11+
## Legal
12+
13+
If your contribution is more than 15 lines of code, you will need to complete a Contributor
14+
License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission
15+
to use the submitted change according to the terms of the project's license, and that the work
16+
being submitted is under appropriate copyright.
17+
18+
Please submit a Contributor License Agreement (CLA) before submitting a pull request.
19+
You may visit https://cla.azure.com to sign digitally. Alternatively, download the
20+
agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or
21+
[Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan,
22+
and email it back to <cla@microsoft.com>. Be sure to include your github user name along with the agreement. Once we have received the
23+
signed CLA, we'll review the request.

0 commit comments

Comments
 (0)