Update upstream

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Replace Black with Ruff, then format whole project.
+44a44e938fb2bd0bb085d8aa4577abeb01653ad3

.github/workflows/lint.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         id: install-deps
         run: |
-          python -m pip install --upgrade pip setuptools wheel black==22.6 requests
+          python -m pip install --upgrade pip setuptools wheel ruff==0.12 requests "typing_extensions>=4.3,<5"
           pip install -U -r requirements.txt
 
       - name: Setup node.js
@@ -42,7 +42,7 @@ jobs:
           warnings: false
           no-comments: ${{ matrix.python-version != '3.x' }}
 
-      - name: Run black
+      - name: Run ruff
         if: ${{ always() && steps.install-deps.outcome == 'success' }}
         run: |
-          black --check discord examples
+          ruff format --check discord examples

MANIFEST.in

@@ -1,5 +1,5 @@
 include README.rst
 include LICENSE
 include requirements.txt
-include discord/bin/*.dll
+include discord/bin/*
 include discord/py.typed

discord/__init__.py

@@ -13,7 +13,7 @@
 __author__ = 'Rapptz'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2015-present Rapptz'
-__version__ = '2.6.0a'
+__version__ = '2.7.0a'
 
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
@@ -73,17 +73,20 @@
 from .soundboard import *
 from .subscription import *
 from .presences import *
+from .primary_guild import *
+from .onboarding import *
+from .collectible import *
 
 
 class VersionInfo(NamedTuple):
     major: int
     minor: int
     micro: int
-    releaselevel: Literal["alpha", "beta", "candidate", "final"]
+    releaselevel: Literal['alpha', 'beta', 'candidate', 'final']
     serial: int
 
 
-version_info: VersionInfo = VersionInfo(major=2, minor=6, micro=0, releaselevel='alpha', serial=0)
+version_info: VersionInfo = VersionInfo(major=2, minor=7, micro=0, releaselevel='alpha', serial=0)
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 

discord/__main__.py

@@ -133,7 +133,7 @@ async def setup(bot):
     await bot.add_cog({name}(bot))
 '''
 
-_cog_extras = '''
+_cog_extras = """
     async def cog_load(self):
         # loading logic goes here
         pass
@@ -170,7 +170,7 @@ async def cog_after_invoke(self, ctx):
         # called after a command is called here
         pass
 
-'''
+"""
 
 
 # certain file names and directory names are forbidden