Skip to content

Commit f00bf5f

Browse files
BobDotComBobDotCom
committed
Merge branch 'master' into v2.x
2 parents ab95493 + 2b31689 commit f00bf5f

Some content is hidden

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

73 files changed

+2341
-1175
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<!-- Warning: No new features will be merged until the next stable release. -->
2-
31
## Summary
42

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

‎.github/workflows/bandit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +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')
5+
# if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v2

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@
1212
name: "CodeQL"
1313

1414
on:
15-
push:
16-
branches: [ master ]
17-
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [ master ]
15+
push: null
16+
pull_request: null
2017
schedule:
2118
- cron: '26 6 * * 6'
2219

2320
jobs:
2421
analyze:
25-
if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
22+
# if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
2623
name: Analyze
2724
runs-on: ubuntu-latest
2825
permissions:

‎.github/workflows/codespell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +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')
5+
# if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v2

‎.github/workflows/mypy.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
name: mypy
2-
on: [pull_request, push]
2+
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')
5+
# if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v2
99
- uses: actions/setup-python@v2
10-
- run: pip install mypy
11-
- run: pip install -r requirements.txt
10+
- run: pip install -r requirements-dev.txt
1211
- run: mkdir --parents --verbose .mypy_cache
13-
- run: mypy --ignore-missing-imports --install-types --non-interactive .
12+
- run: mypy --non-interactive .

‎.github/workflows/pylint.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#name: Pylint
2+
#
3+
#on: [ push, pull_request ]
4+
#
5+
#jobs:
6+
# build:
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 --upgrade pip
20+
# pip install -r requirements-dev.txt
21+
# - name: Check if PR
22+
# if: github.event.pull_request.number
23+
# run: |
24+
# echo "enable=fixme" >> .pylintrc
25+
# - name: Analysing the code with pylint
26+
# run: |
27+
# pylint $(git ls-files '*.py')

‎.github/workflows/python-app.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# This workflow will install Python dependencies, run tests and lint with a single version of Python
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
3+
4+
name: Python application
5+
6+
on: [ push, pull_request ]
7+
8+
jobs:
9+
test:
10+
runs-on: ${{ matrix.os }}
11+
strategy:
12+
matrix:
13+
os: [ ubuntu-latest, macos-latest, windows-latest ]
14+
python-version: [ 3.8, 3.9, "3.10" ]
15+
env:
16+
OS: ${{ matrix.os }}
17+
PYTHON: ${{ matrix.python-version }}
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Set up Python 3.10
21+
uses: actions/setup-python@v2
22+
with:
23+
python-version: ${{ matrix.python-version }}
24+
- name: Install dependencies
25+
run: |
26+
python -m pip install --upgrade pip
27+
pip install flake8
28+
pip install -r requirements-dev.txt
29+
- name: Lint with flake8
30+
run: |
31+
# stop the build if there are Python syntax errors or undefined names
32+
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
33+
# exit-zero treats all errors as warnings.
34+
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=120 --statistics
35+
- name: Run code coverage with pytest
36+
run: |
37+
coverage run -m pytest
38+
coverage xml
39+
- name: Upload code coverage to codecov.io
40+
uses: codecov/codecov-action@v2
41+
with:
42+
# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
43+
env_vars: OS,PYTHON
44+
files: ./coverage.xml
45+
flags: pytest # optional
46+
name: codecov-umbrella # optional
47+
fail_ci_if_error: false # Enable once we have good coverage
48+
verbose: true # optional (default = false)

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ build/
3030
test.py
3131
build/
3232
node_modules/*
33+
.coverage

‎.pylintrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[MESSAGES CONTROL]
22

3-
disable=protected-access
3+
disable=protected-access,fixme
44

55
enable=bad-indentation,line-too-long
66

‎README.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ Pycord
1313
.. image:: https://img.shields.io/pypi/dm/py-cord?color=blueviolet&logo=pypi&logoColor=white&style=for-the-badge
1414
:target: https://pypi.python.org/pypi/py-cord
1515
:alt: PyPI downloads
16+
.. image:: https://img.shields.io/github/v/release/Pycord-Development/pycord?include_prereleases&label=Latest%20Release&logo=github&sort=semver&style=for-the-badge&logoColor=white
17+
:target: https://github.com/Pycord-Development/pycord/releases
18+
:alt: Latest release
1619

1720
A fork of discord.py. Pycord is a modern, easy to use, feature-rich, and async ready API wrapper for Discord written in Python.
1821

@@ -66,6 +69,15 @@ To install the development version, do the following:
6669
$ git clone https://github.com/Pycord-Development/pycord
6770
$ cd pycord
6871
$ python3 -m pip install -U .[voice]
72+
73+
or if you do not want to clone the repository:
74+
75+
.. code:: sh
76+
77+
# Linux/macOS
78+
python3 -m pip install git+https://github.com/Pycord-Development/pycord
79+
# Windows
80+
py -3 -m pip install git+https://github.com/Pycord-Development/pycord
6981
7082
7183
Optional Packages

0 commit comments

Comments
 (0)