Merge branch 'master' into components-v2

Author: Lulalaby

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"

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"