Skip to content

Commit c8792d8

Browse files
authored
Merge branch 'Pycord-Development:master' into master
2 parents cbf960c + f51a1ae commit c8792d8

Some content is hidden

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

41 files changed

+1168
-142
lines changed
File renamed without changes.

.github/CONTRIBUTING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ If the bug report is missing this information then it'll take us longer to fix t
3434

3535
Submitting a pull request is fairly simple, just make sure it focuses on a single aspect and doesn't manage to have scope creep and it's probably good to go. It would be incredibly lovely if the style is consistent to that found in the project. This project follows PEP-8 guidelines (mostly) with a column limit of 125.
3636

37+
## Use of "type: ignore" comments
38+
In some cases, it might be necessary to ignore type checker warnings for one reason or another.
39+
If that is that case, it is **required** that a comment is left explaining why you are
40+
deciding to ignore type checking warnings.
41+
3742
### Licensing
3843

3944
By submitting a pull request, you agree that; 1) You hold the copyright on all submitted code inside said pull request; 2) You agree to transfer all rights to the owner of this repository, and; 3) If you are found to be in fault with any of the above, we shall not be held responsible in any way after the pull request has been merged.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Developer Certificate of Origin (DCO)
2+
```
3+
Version 1.1
4+
5+
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
6+
7+
Everyone is permitted to copy and distribute verbatim copies of this
8+
license document, but changing it is not allowed.
9+
10+
11+
Developer's Certificate of Origin 1.1
12+
13+
By making a contribution to this project, I certify that:
14+
15+
(a) The contribution was created in whole or in part by me and I
16+
have the right to submit it under the open source license
17+
indicated in the file; or
18+
19+
(b) The contribution is based upon previous work that, to the best
20+
of my knowledge, is covered under an appropriate open source
21+
license and I have the right under that license to submit that
22+
work with modifications, whether created in whole or in part
23+
by me, under the same open source license (unless I am
24+
permitted to submit under a different license), as indicated
25+
in the file; or
26+
27+
(c) The contribution was provided directly to me by some other
28+
person who certified (a), (b) or (c) and I have not modified
29+
it.
30+
31+
(d) I understand and agree that this project and the contribution
32+
are public and that a record of the contribution (including all
33+
personal information I submit with it, including my sign-off) is
34+
maintained indefinitely and may be redistributed consistent with
35+
this project or the open source license(s) involved.
36+
```

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
attributes:
77
value: >
88
Thanks for taking the time to fill out a bug.
9-
If you want real-time support, consider joining our Discord at https://discord.gg/r3sSKJJ instead.
9+
If you want real-time support, consider joining our Discord at https://pycord.dev/discord instead.
1010
1111
Please note that this form is for bugs only!
1212
- type: input

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ contact_links:
55
url: https://github.com/Pycord-Development/pycord/discussions
66
- name: Discord Server
77
about: Use our official Discord server to ask for help and questions as well.
8-
url: https://discord.gg/UCXwPR7Pew
8+
url: https://pycord.dev/discord
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Vulnerability Report
2+
description: Report vulnerabilities
3+
labels: unconfirmed vulnerability
4+
assignees: BobDotCom,Lulalaby,CodeWithSwastik
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: >
9+
Thanks for taking the time to fill out a vulnerability report.
10+
If you want real-time support, consider joining our Discord at https://pycord.dev/discord instead.
11+
12+
Please note that this form is for vulnerability reports only!
13+
- type: textarea
14+
attributes:
15+
label: Summary
16+
description: A simple summary of your vulnerability report
17+
validations:
18+
required: true
19+
- type: textarea
20+
attributes:
21+
label: Reproduction Steps
22+
description: >
23+
What you did to make it happen.
24+
validations:
25+
required: true
26+
- type: textarea
27+
attributes:
28+
label: Minimal Reproducible Code
29+
description: >
30+
A short snippet of code that showcases the vulnerability.
31+
render: python
32+
- type: textarea
33+
attributes:
34+
label: System Information
35+
description: >
36+
Run `python -m discord -v` and paste this information below.
37+
38+
This command required v1.1.0 or higher of the library. If this errors out then show some basic
39+
information involving your system such as operating system and Python version.
40+
validations:
41+
required: true
42+
- type: checkboxes
43+
attributes:
44+
label: Checklist
45+
description: >
46+
Let's make sure you've properly done due dilligence when reporting this issue!
47+
options:
48+
- label: I have searched the open issues for duplicates.
49+
required: true
50+
- label: I have shown the entire steps to reproduce the vulnerability.
51+
required: true
52+
- label: I have removed my token from display, if visible.
53+
required: true
54+
- type: textarea
55+
attributes:
56+
label: Additional Context
57+
description: If there is anything else to say, please do so here.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
- [ ] If code changes were made then they have been tested.
1010
- [ ] I have updated the documentation to reflect the changes.
11+
- [ ] If `type: ignore` comments were used, a comment is also left explaining why
1112
- [ ] This PR fixes an issue.
1213
- [ ] This PR adds something new (e.g. new method or parameters).
1314
- [ ] This PR is a breaking change (e.g. methods or parameters removed/renamed)
14-
- [ ] This PR is **not** a code change (e.g. documentation, README, typehinting, ...)
15+
- [ ] This PR is **not** a code change (e.g. documentation, README, typehinting, examples, ...)

.github/SECURITY.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 2.0.0 | :white_check_mark: |
8+
| 1.7.x | :white_check_mark: |
9+
| < 1.7.3 | :x: |
10+
11+
## Reporting a Vulnerability
12+
13+
If you find a vulnerability you have two ways to report it:
14+
- Write us on https://pycord.dev/discord
15+
- Open an [issue](https://github.com/Pycord-Development/pycord/issues/new/choose)

.github/workflows/bandit.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: bandit
2+
on: [pull_request, push]
3+
jobs:
4+
bandit:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v2
8+
- uses: actions/setup-python@v2
9+
- run: pip install bandit
10+
- run: bandit --recursive --skip B101,B104,B105,B110,B307,B311,B404,B603,B607 .

.github/workflows/mypy.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: mypy
2+
on: [pull_request, push]
3+
jobs:
4+
mypy:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v2
8+
- uses: actions/setup-python@v2
9+
- run: pip install mypy
10+
- run: pip install -r requirements.txt
11+
- run: mkdir --parents --verbose .mypy_cache
12+
- run: mypy --ignore-missing-imports --install-types --non-interactive . || true

0 commit comments

Comments
 (0)