Document ConnectionType and readd requests to doc requirements

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`.

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'],
+        p = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                             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': [
+    'test': ['coverage[toml]', 'pytest', 'pytest-asyncio', 'pytest-cov', 'pytest-mock'],
-        'coverage[toml]',
-        'pytest',
-        'pytest-asyncio',
-        'pytest-cov',
-        'pytest-mock'
-    ]
 }
 
-setup(name='discord.py-self',
+setup(
-      author='Dolfies',
+    name='discord.py-self',
-      url='https://github.com/dolfies/discord.py-self',
+    author='Dolfies',
-      project_urls={
+    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,
+    version=version,
-      packages=find_packages() + ['discord.ext.commands', 'discord.ext.tasks'],
+    packages=find_packages() + ['discord.ext.commands', 'discord.ext.tasks'],
-      license='MIT',
+    license='MIT',
-      description='A Python wrapper for the Discord user API',
+    description='A Python wrapper for the Discord user API',
-      long_description=readme,
+    long_description=readme,
-      long_description_content_type="text/x-rst",
+    long_description_content_type="text/x-rst",
-      include_package_data=True,
+    include_package_data=True,
-      install_requires=requirements,
+    install_requires=requirements,
-      extras_require=extras_require,
+    extras_require=extras_require,
-      python_requires='>=3.8.0',
+    python_requires='>=3.8.0',
-      classifiers=[
+    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',
-      ]
+    ],
 )