diff --git a/docs/api.rst b/docs/api.rst index 1d4886aaf..246fb32b3 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -3153,6 +3153,76 @@ of :class:`enum.Enum`. The user must accept Discord's terms of service. +.. class:: ConnectionType + + Represents the type of connection a user has with Discord. + + .. versionadded:: 2.0 + + .. attribute:: battle_net + + The user has a Battle.net connection. + + .. attribute:: contacts + + The user has a contact sync connection. + + .. attribute:: epic_games + + The user has an Epic Games connection. + + .. attribute:: facebook + + The user has a Facebook connection. + + .. attribute:: github + + The user has a GitHub connection. + + .. attribute:: league_of_legends + + The user has a League of Legends connection. + + .. attribute:: playstation + + The user has a PlayStation connection. + + .. attribute:: reddit + + The user has a Reddit connection. + + .. attribute:: samsung + + The user has a Samsung Account connection. + + .. attribute:: spotify + + The user has a Spotify connection. + + .. attribute:: skype + + The user has a Skype connection. + + .. attribute:: steam + + The user has a Steam connection. + + .. attribute:: twitch + + The user has a Twitch connection. + + .. attribute:: twitter + + The user has a Twitter connection. + + .. attribute:: youtube + + The user has a YouTube connection. + + .. attribute:: xbox + + The user has an Xbox Live connection. + .. class:: InteractionType Specifies the type of :class:`Interaction`. diff --git a/setup.py b/setup.py index b1d00f0ed..0feb162c9 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import re requirements = [] with open('requirements.txt') as f: - requirements = f.read().splitlines() + requirements = f.read().splitlines() version = '' with open('discord/__init__.py') as f: @@ -16,13 +16,12 @@ if version.endswith(('a', 'b', 'rc')): # append version identifier based on commit count try: import subprocess - p = subprocess.Popen(['git', 'rev-list', '--count', 'HEAD'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + p = subprocess.Popen(['git', 'rev-list', '--count', 'HEAD'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = p.communicate() if out: version += out.decode('utf-8').strip() - p = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = p.communicate() if out: version += '+g' + out.decode('utf-8').strip() @@ -40,40 +39,36 @@ extras_require = { 'sphinxcontrib_trio==1.1.2', 'sphinxcontrib-websupport', 'typing-extensions', + 'requests', ], 'speed': [ 'aiohttp[speedups]', 'orjson>=3.5.4', ], - 'test': [ - 'coverage[toml]', - 'pytest', - 'pytest-asyncio', - 'pytest-cov', - 'pytest-mock' - ] + 'test': ['coverage[toml]', 'pytest', 'pytest-asyncio', 'pytest-cov', 'pytest-mock'], } -setup(name='discord.py-self', - author='Dolfies', - url='https://github.com/dolfies/discord.py-self', - project_urls={ +setup( + name='discord.py-self', + author='Dolfies', + url='https://github.com/dolfies/discord.py-self', + project_urls={ "Documentation": "https://discordpy-self.readthedocs.io/en/latest/", "Issue tracker": "https://github.com/dolfies/discord.py-self/issues", "Project updates": "https://t.me/dpy_self", "Discussion & support": "https://t.me/dpy_self_discussions", - }, - version=version, - packages=find_packages() + ['discord.ext.commands', 'discord.ext.tasks'], - license='MIT', - description='A Python wrapper for the Discord user API', - long_description=readme, - long_description_content_type="text/x-rst", - include_package_data=True, - install_requires=requirements, - extras_require=extras_require, - python_requires='>=3.8.0', - classifiers=[ + }, + version=version, + packages=find_packages() + ['discord.ext.commands', 'discord.ext.tasks'], + license='MIT', + description='A Python wrapper for the Discord user API', + long_description=readme, + long_description_content_type="text/x-rst", + include_package_data=True, + install_requires=requirements, + extras_require=extras_require, + python_requires='>=3.8.0', + classifiers=[ 'Development Status :: 5 - Production/Stable', 'License :: OSI Approved :: MIT License', 'Intended Audience :: Developers', @@ -87,5 +82,5 @@ setup(name='discord.py-self', 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Utilities', 'Typing :: Typed', - ] + ], )