Skip to content

Commit 6ea3e05

Browse files
committed
Merge branch 'master' into feat/tests
2 parents b05b56f + 0d4c60d commit 6ea3e05

File tree

5 files changed

+891
-810
lines changed

5 files changed

+891
-810
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
- id: end-of-file-fixer
1111
exclude: \.(po|pot|yml|yaml)$
1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: v0.12.11
13+
rev: v0.12.12
1414
hooks:
1515
- id: ruff
1616
args: [ --fix ]

discord/banner.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11

22

3-
${bold_white} ${reset} ${blue} ````'````````````````````````'`
4-
${bold_white} ${reset} ${bold_blue} `. `-
5-
${bold_white} O88888${reset} ${yellow}'' _
6-
${bold_white}u@@@@@@@@@@@BG! O@@@@8${reset} ${bold_yellow}_ ${reset}${bold_white}:oQ@@@@@@#Rr${reset}${bold_yellow} `-
7-
${bold_white}u@@@@@@@@@@@@@@O. O@@@@8${reset} ${red}- ${reset}${bold_white}k@@@@#dWQ@@@@D`${reset}${red} .
8-
${bold_white}u@@@@@` 'I@@@@@a`O9999r V6996u ,LaEQQQDUv. :}P$QQ8OI?. V9999L_H8Qc !y0QQRY.O@@@@8${reset} ${bold_red}- ${reset}${bold_white}Vkkk} E@@@@:${reset}${bold_red} .
9-
${bold_white}u@@@@@` :@@@@@R I@@@@Q` ^@@@@@" -M@@@@@@@@@@@q ,Q@@@@@@@@@@@V` O@@@@Q#@@@G-0@@@@@@@##@@@@8${reset} ${purple}- ${reset}${bold_white}-m3HQ@@@0r${reset}${purple} .
10-
${bold_white}u@@@@@}iYz#@@@@@) `$@@@@} O@@@@j -B@@@@Q \@@@T ,#@@@@K_`=#@@@@q O@@@@@8]*);E@@@@@V::V@@@@@8${reset} ${bold_purple}- ${reset}${bold_white}:@@@@@#$z;${reset}${bold_purple} .
11-
${bold_white}u@@@@@@@@@@@@@O! ,#@@@B.*@@@@0` L@@@@@ T@@@@@` y@@@@@: O@@@@Q` @@@@@H G@@@@8${reset} ${black}- ${reset}${bold_white}```=D@@@@P${reset}${black} .
12-
${bold_white}u@@@@@6OOOMj]! x@@@@}9@@@#! x@@@@@ }@@@@@. U@@@@@, O@@@@$ #@@@@b d@@@@8${reset} ${bold_black}- ${reset}${bold_white},####0~` :6@@@@8${reset}${bold_black} .
13-
${bold_white}u@@@@@` K@@@#@@@@x `0@@@@# /@@| .Q@@@@0r~Y@@@@@w O@@@@$ P@@@@@OxxO@@@@@8${reset} ${blue}- ${reset}${bold_white}c#@@@@@@@@@@@Q=${reset}${blue} .
14-
${bold_white}u@@@@@` `#@@@@@@g `c@@@@@@@@@@#T `M@@@@@@@@@@#) O@@@@$ `z@@@@@@@QQ@@@@8${reset} ${bold_blue}_ ${reset}${bold_white}`rz0QBBB8bV:${reset}${bold_blue} `-
15-
${bold_white}=yyyyV x@@@@@#: `~YI5MWIx! `^}m5MGwx: |yyyyv `*w33y~ )yyyyx${reset} ${yellow}.` -
16-
${bold_white}=gEB@@@@#r ${reset} ${bold_yellow} '. .`
17-
${bold_white}`g@@@@@#X_ ${reset} ${blue} '`````'''''''''''''''''''````'`
3+
${bold_white} ${reset}
4+
${bold_white} ${reset}
5+
${bold_white} O88888${reset}
6+
${bold_white}u@@@@@@@@@@@BG! O@@@@8${reset}
7+
${bold_white}u@@@@@@@@@@@@@@O. O@@@@8${reset}
8+
${bold_white}u@@@@@` 'I@@@@@a`O9999r V6996u ,LaEQQQDUv. :}P$QQ8OI?. V9999L_H8Qc !y0QQRY.O@@@@8${reset}
9+
${bold_white}u@@@@@` :@@@@@R I@@@@Q` ^@@@@@" -M@@@@@@@@@@@q ,Q@@@@@@@@@@@V` O@@@@Q#@@@G-0@@@@@@@##@@@@8${reset}
10+
${bold_white}u@@@@@}iYz#@@@@@) `$@@@@} O@@@@j -B@@@@Q \@@@T ,#@@@@K_`=#@@@@q O@@@@@8]*);E@@@@@V::V@@@@@8${reset}
11+
${bold_white}u@@@@@@@@@@@@@O! ,#@@@B.*@@@@0` L@@@@@ T@@@@@` y@@@@@: O@@@@Q` @@@@@H G@@@@8${reset}
12+
${bold_white}u@@@@@6OOOMj]! x@@@@}9@@@#! x@@@@@ }@@@@@. U@@@@@, O@@@@$ #@@@@b d@@@@8${reset}
13+
${bold_white}u@@@@@` K@@@#@@@@x `0@@@@# /@@| .Q@@@@0r~Y@@@@@w O@@@@$ P@@@@@OxxO@@@@@8${reset}
14+
${bold_white}u@@@@@` `#@@@@@@g `c@@@@@@@@@@#T `M@@@@@@@@@@#) O@@@@$ `z@@@@@@@QQ@@@@8${reset}
15+
${bold_white}=yyyyV x@@@@@#: `~YI5MWIx! `^}m5MGwx: |yyyyv `*w33y~ )yyyyx${reset}
16+
${bold_white}=gEB@@@@#r ${reset}
17+
${bold_white}`g@@@@@#X_ ${reset}
1818
${bold_white}`-":_`

discord/types/guild.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ class UnavailableGuild(TypedDict):
170170
"NEW_THREAD_PERMISSIONS",
171171
"NON_COMMUNITY_RAID_ALERTS",
172172
"PARTNERED",
173+
"PIN_PERMISSION_MIGRATION_COMPLETE",
173174
"PREMIUM_TIER_3_OVERRIDE",
174175
"PREVIEW_ENABLED",
175176
"PRIVATE_THREADS",

pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ dev = [
7272
"mypy~=1.17.1",
7373
"pre-commit==4.2.0",
7474
"python-dotenv>=1.1.1",
75+
"ruff>=0.12.12",
7576
"tox>=4.27.0",
7677
"tox-gh>=1.5.0",
7778
"tox-uv>=1.26.1",
@@ -94,14 +95,12 @@ version-file = "discord/_version.py"
9495
[tool.hatch.build.targets.wheel]
9596
only-packages = true
9697
packages = ["discord"]
97-
only-include = ["discord", "LICENSE", "pyproject.toml", "discord/bin/*.dll", "discord/ibanner.txt", "discord/banner.txt", "discord/chan/ART.txt"]
98-
artifacts = ["discord/bin/*.dll", "discord/ibanner.txt", "discord/banner.txt", "discord/chan/ART.txt"]
98+
only-include = ["discord", "README.rst", "LICENSE", "pyproject.toml", "discord/bin/*.dll", "discord/emojis.json", "discord/ibanner.txt", "discord/banner.txt", "discord/chan/ART.txt",]
9999

100100
[tool.hatch.build.targets.sdist]
101101
only-packages = true
102102
packages = ["discord"]
103-
only-include = ["discord", "README.rst", "LICENSE", "pyproject.toml", "discord/bin/*.dll"]
104-
artifacts = ["discord/bin/*.dll"]
103+
only-include = ["discord", "README.rst", "LICENSE", "pyproject.toml", "discord/bin/*.dll", "discord/emojis.json", "discord/ibanner.txt", "discord/banner.txt", "discord/chan/ART.txt",]
105104

106105
[tool.black]
107106
target-version = ['py310', 'py311', 'py312', 'py313']

0 commit comments

Comments
 (0)