Skip to content

Commit a0cb640

Browse files
authored
Merge branch 'master' into features/voice-receive
2 parents 5642422 + 27e8dc3 commit a0cb640

File tree

129 files changed

+1975
-36791
lines changed

Some content is hidden

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

129 files changed

+1975
-36791
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ The following is a set of guidelines for contributing to the repository. These a
88

99
Generally speaking questions are better suited in our resources below.
1010

11-
- The official support server: https://discord.gg/UCXwPR7Pew
12-
- The Discord API server under #python_discord-py: https://discord.gg/discord-api
11+
- The official support server: https://pycord.dev/discord
1312
- [The FAQ in the documentation](https://docs.pycord.dev/en/master/faq.html)
1413
- [StackOverflow's `pycord` tag](https://stackoverflow.com/questions/tagged/pycord)
1514

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Warning: We have a feature freeze till release
2+
That means we won't accept new features for now. Only bug fixes.
3+
14
## Summary
25

36
<!-- What is this pull request for? Does it fix any issues? -->

.github/SECURITY.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
| Version | Supported |
66
| ------- | ------------------ |
77
| 2.0.0 | :white_check_mark: |
8-
| 1.7.x | :white_check_mark: |
9-
| < 1.7.3 | :x: |
8+
| <2.0.0 | :x: |
109

1110
## Reporting a Vulnerability
1211

.github/workflows/bandit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: bandit
22
on: [pull_request, push]
33
jobs:
44
bandit:
5+
if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
56
runs-on: ubuntu-latest
67
steps:
78
- uses: actions/checkout@v2

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ on:
2222

2323
jobs:
2424
analyze:
25+
if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
2526
name: Analyze
2627
runs-on: ubuntu-latest
2728
permissions:

.github/workflows/codespell.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: codespell
22
on: [pull_request, push]
33
jobs:
44
codespell:
5+
if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
56
runs-on: ubuntu-latest
67
steps:
78
- uses: actions/checkout@v2

.github/workflows/docs.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Docs
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
docs:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
python-version: [ 3.8 ]
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Set up Python ${{ matrix.python-version }}
14+
uses: actions/setup-python@v2
15+
with:
16+
python-version: ${{ matrix.python-version }}
17+
- name: Install dependencies
18+
run: |
19+
python -m pip install -U pip
20+
pip install -U sphinx sphinxcontrib-trio aiohttp sphinxcontrib-websupport myst-parser
21+
- name: Compile to html
22+
run: |
23+
cd docs
24+
make html

.github/workflows/mypy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ name: mypy
22
on: [pull_request, push]
33
jobs:
44
mypy:
5+
if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
56
runs-on: ubuntu-latest
67
steps:
78
- uses: actions/checkout@v2
89
- uses: actions/setup-python@v2
910
- run: pip install mypy
1011
- run: pip install -r requirements.txt
1112
- run: mkdir --parents --verbose .mypy_cache
12-
- run: mypy --ignore-missing-imports --install-types --non-interactive . || true
13+
- run: mypy --ignore-missing-imports --install-types --non-interactive .

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ docs/crowdin.py
1818
*.flac
1919
*.mo
2020
.idea/
21+
env/
22+
.vs/
2123
.DS_Store
2224
.python-version
2325
__pycache__
@@ -26,3 +28,6 @@ __pycache__
2628
env/
2729
build/
2830
test.py
31+
build/
32+
node_modules/*
33+
test.py

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ sphinx:
1010
builder: html
1111

1212
python:
13-
version: 3.8
13+
version: "3.8"
1414
install:
1515
- method: pip
1616
path: .

0 commit comments

Comments
 (0)