Skip to content

Commit f186811

Browse files
authored
Merge branch 'master' into fix/asset-extentions
2 parents ee12a06 + bc0cbf6 commit f186811

14 files changed

Lines changed: 38 additions & 30 deletions

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ body:
7777
required: true
7878
- label: I have removed my token from display, if visible.
7979
required: true
80+
- label: I have read the [Contributing Guidelines](https://github.com/Pycord-Development/pycord/blob/master/CONTRIBUTING.md).
81+
required: true
8082
- type: textarea
8183
attributes:
8284
label: Additional Context

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,13 @@ body:
5050
attributes:
5151
label: Additional Context
5252
description: If there is anything else to say, please do so here.
53+
- type: checkboxes
54+
attributes:
55+
label: Checklist
56+
description: >
57+
Let's make sure you've properly done due diligence when requesting this feature!
58+
options:
59+
- label: I have searched the open issues for duplicates.
60+
required: true
61+
- label: I have read the [Contributing Guidelines](https://github.com/Pycord-Development/pycord/blob/master/CONTRIBUTING.md).
62+
required: true

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
- name: "Checkout repository"
2929
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3030
- name: "Initialize CodeQL"
31-
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
31+
uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
3232
with:
3333
languages: ${{ matrix.language }}
3434
- name: "Autobuild"
35-
uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
35+
uses: github/codeql-action/autobuild@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
3636
- name: "Perform CodeQL Analysis"
37-
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
37+
uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1

.github/workflows/docs-localization-download.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
working-directory: ./docs
4141
- name: "Crowdin"
4242
id: crowdin
43-
uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
43+
uses: crowdin/github-action@e0c8f73cdc0fafde9396e056c5038217000a32d1 # v2.16.4
4444
with:
4545
upload_sources: false
4646
upload_translations: false

.github/workflows/docs-localization-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
4545
working-directory: ./docs
4646
- name: "Crowdin"
47-
uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
47+
uses: crowdin/github-action@e0c8f73cdc0fafde9396e056c5038217000a32d1 # v2.16.4
4848
with:
4949
upload_sources: true
5050
upload_translations: false

.github/workflows/enforce-pr-template.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ jobs:
5959
'github-actions[bot]',
6060
'github-copilot[bot]',
6161
'copilot[bot]',
62-
'copilot'
62+
'copilot',
63+
'pre-commit-ci',
64+
'pre-commit-ci[bot]'
6365
];
6466
6567
if (skipAuthors.includes(author)) {
@@ -88,7 +90,7 @@ jobs:
8890
const problems = [];
8991
9092
// Basic length check – tune as needed
91-
if (body.length < 150) {
93+
if (body.length < 200) {
9294
problems.push('PR description is too short (expected more content based on the template).');
9395
}
9496
@@ -105,6 +107,11 @@ jobs:
105107
}
106108
}
107109
110+
// Enforce Contribution reading line
111+
if (!body.includes('I have read the [Contributing Guidelines](https://github.com/Pycord-Development/pycord/blob/master/CONTRIBUTING.md)')) {
112+
problems.push('The line "I have read the [Contributing Guidelines](https://github.com/Pycord-Development/pycord/blob/master/CONTRIBUTING.md)" is missing.');
113+
}
114+
108115
// Enforce AI disclosure line
109116
if (!body.includes('AI Usage has been disclosed')) {
110117
problems.push('The line "AI Usage has been disclosed." is missing.');

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ jobs:
215215
python3 -m build --sdist
216216
python3 -m build --wheel
217217
- name: "Create GitHub Release"
218-
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
218+
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
219219
id: gh-release
220220
with:
221221
tag_name: "v${{ inputs.version }}"

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repos:
2626
- id: pyupgrade
2727
exclude: \.(po|pot|yml|yaml)$
2828
- repo: https://github.com/PyCQA/isort
29-
rev: 8.0.1
29+
rev: 9.0.0b1
3030
hooks:
3131
- id: isort
3232
exclude: \.(po|pot|yml|yaml)$
@@ -87,7 +87,7 @@ repos:
8787
args: [--prose-wrap=always, --print-width=88]
8888
exclude: \.(po|pot|yml|yaml)$
8989
- repo: https://github.com/DanielNoord/pydocstringformatter
90-
rev: v0.7.5
90+
rev: v1.0.0
9191
hooks:
9292
- id: pydocstringformatter
9393
exclude: \.(po|pot|yml|yaml)$

discord/commands/core.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@
4747

4848
from ..channel import PartialMessageable, _threaded_guild_channel_factory
4949
from ..enums import Enum as DiscordEnum
50-
from ..enums import (
51-
IntegrationType,
52-
InteractionContextType,
53-
SlashCommandOptionType,
54-
)
50+
from ..enums import IntegrationType, InteractionContextType, SlashCommandOptionType
5551
from ..errors import (
5652
ApplicationCommandError,
5753
ApplicationCommandInvokeError,

discord/guild.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,7 @@
119119
from .template import Template
120120
from .types.guild import Ban as BanPayload
121121
from .types.guild import Guild as GuildPayload
122-
from .types.guild import (
123-
GuildFeature,
124-
MFALevel,
125-
)
122+
from .types.guild import GuildFeature, MFALevel
126123
from .types.guild import ModifyIncidents as ModifyIncidentsPayload
127124
from .types.member import Member as MemberPayload
128125
from .types.threads import Thread as ThreadPayload

0 commit comments

Comments
 (0)