Merge branch 'master' into burst_react

Signed-off-by: Lala Sabathil <[email protected]>

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
   #          - --remove-duplicate-keys
   #          - --remove-unused-variables
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+    rev: v3.13.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
@@ -28,7 +28,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 23.9.1
     hooks:
       - id: black
         args: [--safe, --quiet]

CHANGELOG.md

@@ -169,6 +169,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2156](https://github.com/Pycord-Development/pycord/pull/2156))
 - Fixed `ScheduledEvent.creator_id` returning `str` instead of `int`.
   ([#2162](https://github.com/Pycord-Development/pycord/pull/2162))
+- Fixed `_bytes_to_base64_data` not defined.
+  ([#2185](https://github.com/Pycord-Development/pycord/pull/2185))
 - Fixed type-hinting of `values` argument of `basic_autocomplete` to include
   type-hinting of `Iterable[OptionChoice]`.
   ([#2164](https://github.com/Pycord-Development/pycord/pull/2164))

discord/guild.py

@@ -2908,7 +2908,7 @@ async def create_role(
             if icon is None:
                 fields["icon"] = None
             else:
-                fields["icon"] = _bytes_to_base64_data(icon)
+                fields["icon"] = utils._bytes_to_base64_data(icon)
                 fields["unicode_emoji"] = None
 
         if unicode_emoji is not MISSING:

requirements/dev.txt

@@ -1,11 +1,11 @@
 -r _.txt
 pylint~=2.17.5
-pytest~=7.4.1
+pytest~=7.4.3
 pytest-asyncio~=0.21.1
 # pytest-order~=1.0.1
 mypy~=1.5.1
 coverage~=7.3
-pre-commit==3.4.0
-codespell==2.2.5
+pre-commit==3.5.0
+codespell==2.2.6
 bandit==1.7.5
 flake8==6.1.0

requirements/speed.txt

@@ -1,2 +1,2 @@
-msgspec~=0.18.0
+msgspec~=0.18.4
 aiohttp[speedups]