Skip to content

Commit 9d6791e

Browse files
authored
Merge pull request #6 from BobDotCom/master
move changes to patch-1 branch
2 parents 9fa77a3 + 7f20690 commit 9d6791e

File tree

22 files changed

+853
-296
lines changed

22 files changed

+853
-296
lines changed

.github/workflows/bypass-review.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
on:
2+
pull_request_target:
3+
types: [labeled]
4+
5+
name: "Bypass review"
6+
7+
8+
jobs:
9+
automerge:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check PR label
13+
if: github.event.label.name == 'bypass-review'
14+
uses: "lannonbr/[email protected]"
15+
with:
16+
permission: "write"
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
20+
- name: Merge
21+
if: ${{ success() }}
22+
uses: juliangruber/merge-pull-request-action@v1
23+
with:
24+
github-token: ${{ secrets.GITHUB_TOKEN }}
25+
number: ${{ github.event.pull_request.number }}
26+
method: merge
27+
28+
- name: Cancel
29+
if: ${{ failure() }}
30+
run:
31+
echo Not merging. Cancelled.

README.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ pycord
1010
.. image:: https://img.shields.io/pypi/pyversions/py-cord.svg
1111
:target: https://pypi.python.org/pypi/py-cord
1212
:alt: PyPI supported Python versions
13+
.. image:: https://img.shields.io/pypi/dm/py-cord?color=blue
14+
:target: https://pypi.python.org/pypi/py-cord
15+
:alt: PyPI downloads
1316

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

discord/__main__.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@
2727
import sys
2828
from pathlib import Path
2929

30+
from typing import Tuple
31+
3032
import discord
3133
import pkg_resources
3234
import aiohttp
3335
import platform
3436

35-
def show_version():
37+
def show_version() -> None:
3638
entries = []
3739

3840
entries.append('- Python v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}'.format(sys.version_info))
@@ -48,7 +50,7 @@ def show_version():
4850
entries.append('- system info: {0.system} {0.release} {0.version}'.format(uname))
4951
print('\n'.join(entries))
5052

51-
def core(parser, args):
53+
def core(parser, args) -> None:
5254
if args.version:
5355
show_version()
5456

@@ -173,7 +175,7 @@ async def cog_after_invoke(self, ctx):
173175

174176
_translation_table = str.maketrans(_base_table)
175177

176-
def to_path(parser, name, *, replace_spaces=False):
178+
def to_path(parser, name, *, replace_spaces=False) -> Path:
177179
if isinstance(name, Path):
178180
return name
179181

@@ -188,7 +190,7 @@ def to_path(parser, name, *, replace_spaces=False):
188190
name = name.replace(' ', '-')
189191
return Path(name)
190192

191-
def newbot(parser, args):
193+
def newbot(parser, args) -> None:
192194
new_directory = to_path(parser, args.directory) / to_path(parser, args.name)
193195

194196
# as a note exist_ok for Path is a 3.5+ only feature
@@ -229,7 +231,7 @@ def newbot(parser, args):
229231

230232
print('successfully made bot at', new_directory)
231233

232-
def newcog(parser, args):
234+
def newcog(parser, args) -> None:
233235
cog_dir = to_path(parser, args.directory)
234236
try:
235237
cog_dir.mkdir(exist_ok=True)
@@ -262,7 +264,7 @@ def newcog(parser, args):
262264
else:
263265
print('successfully made cog at', directory)
264266

265-
def add_newbot_args(subparser):
267+
def add_newbot_args(subparser: argparse._SubParsersAction) -> None:
266268
parser = subparser.add_parser('newbot', help='creates a command bot project quickly')
267269
parser.set_defaults(func=newbot)
268270

@@ -272,7 +274,7 @@ def add_newbot_args(subparser):
272274
parser.add_argument('--sharded', help='whether to use AutoShardedBot', action='store_true')
273275
parser.add_argument('--no-git', help='do not create a .gitignore file', action='store_true', dest='no_git')
274276

275-
def add_newcog_args(subparser):
277+
def add_newcog_args(subparser: argparse._SubParsersAction) -> None:
276278
parser = subparser.add_parser('newcog', help='creates a new cog template quickly')
277279
parser.set_defaults(func=newcog)
278280

@@ -283,7 +285,7 @@ def add_newcog_args(subparser):
283285
parser.add_argument('--hide-commands', help='whether to hide all commands in the cog', action='store_true')
284286
parser.add_argument('--full', help='add all special methods as well', action='store_true')
285287

286-
def parse_args():
288+
def parse_args() -> Tuple[argparse.ArgumentParser, argparse.Namespace]:
287289
parser = argparse.ArgumentParser(prog='discord', description='Tools for helping with discord.py')
288290
parser.add_argument('-v', '--version', action='store_true', help='shows the library version')
289291
parser.set_defaults(func=core)
@@ -293,7 +295,7 @@ def parse_args():
293295
add_newcog_args(subparser)
294296
return parser, parser.parse_args()
295297

296-
def main():
298+
def main() -> None:
297299
parser, args = parse_args()
298300
args.func(parser, args)
299301

0 commit comments

Comments
 (0)