Merge branch 'master' into feat/role-tags-rewrite

Signed-off-by: Paillat <[email protected]>

Author: Paillat-dev

discord/ext/bridge/core.py

@@ -232,7 +232,7 @@ def __getattribute__(self, name):
         except AttributeError as e:
             # if it doesn't exist, check this list, if the name of
             # the parameter is here
-            if name is self.__special_attrs__:
+            if name in self.__special_attrs__:
                 raise e
 
             # looks up the result in the variants.

discord/ext/pages/pagination.py

@@ -1163,7 +1163,7 @@ async def respond(
         if target is not None and not isinstance(target, discord.abc.Messageable):
             raise TypeError(f"expected abc.Messageable not {target.__class__!r}")
 
-        if ephemeral and (self.timeout >= 900 or self.timeout is None):
+        if ephemeral and (self.timeout is None or self.timeout >= 900):
             raise ValueError(
                 "paginator responses cannot be ephemeral if the paginator timeout is 15"
                 " minutes or greater"

discord/role.py

@@ -162,9 +162,8 @@ class RoleTags:
     that gives it context for the reason the role is managed.
 
     Role tags are a fairly complex topic, since it's usually hard to determine which role tag combination represents which role type.
-    In order to make your life easier, pycord provides a :attr:`RoleTags.type` attribute that attempts to determine the role type based on the role tags. It's value is not provided by discord but is rather computed by pycord based on the role tags.
-    If you find an issue, please open an issue on `GitHub <https://github.com/Pycord-Development/pycord/issues/new?template=bug_report.yml>`_.
-    Read `this <https://lulalaby.notion.site/Special-Roles-Documentation-17411d3839e680abbb1eff63c51bd7a7?pvs=4>`_ if you need detailed information about how role tags work.
+    We aim to improve the documentation / introduce new attributes in future.
+    For the meantime read `this <https://lulalaby.notion.site/Special-Roles-Documentation-17411d3839e680abbb1eff63c51bd7a7?pvs=4>`_ if you need detailed information about how role tags work.
 
     .. versionadded:: 1.6
     .. versionchanged:: 2.7

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
-    "setuptools>=62.6,<=75.8.0",
-    "setuptools-scm>=6.2,<=8.1.0",
+    "setuptools>=62.6,<=75.8.2",
+    "setuptools-scm>=6.2,<=8.2.0",
 ]
 build-backend = "setuptools.build_meta"