Skip to content

Commit 5e9b04b

Browse files
authored
Merge branch 'master' into fix/type-error-paginator
Signed-off-by: Paillat <paillat@pycord.dev>
2 parents 4460c28 + 9914770 commit 5e9b04b

File tree

14 files changed

+28
-26
lines changed

14 files changed

+28
-26
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
language: ["python"]
2727
steps:
2828
- name: "Checkout repository"
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030
- name: "Initialize CodeQL"
3131
uses: github/codeql-action/init@v4
3232
with:

.github/workflows/docs-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- name: "Checkout Repository"
39-
uses: actions/checkout@v5
39+
uses: actions/checkout@v6
4040
- name: "Setup Python"
4141
uses: actions/setup-python@v6
4242
with:

.github/workflows/docs-json-export.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Checkout repository
1515
id: checkout
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717
- name: Set up Python
1818
uses: actions/setup-python@v6
1919
id: setup-python

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pr_id: ${{ steps.convert_outputs.outputs.pr_id }}
1616
steps:
1717
- name: "Checkout Repository"
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919
with:
2020
fetch-tags: true
2121
- name: "Install Python"
@@ -74,7 +74,7 @@ jobs:
7474
environment: translations
7575
steps:
7676
- name: "Checkout Repository"
77-
uses: actions/checkout@v5
77+
uses: actions/checkout@v6
7878
- name: "Refresh Pull"
7979
run: |
8080
git fetch --all

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
environment: translations
2121
steps:
2222
- name: "Checkout Repository"
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v6
2424
with:
2525
fetch-tags: true
2626
- name: "Install Python"

.github/workflows/lib-checks.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: "Checkout Repository"
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636
- name: "Setup Python"
3737
uses: actions/setup-python@v6
3838
with:
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353
steps:
5454
- name: "Checkout Repository"
55-
uses: actions/checkout@v5
55+
uses: actions/checkout@v6
5656
- name: "Setup Python"
5757
uses: actions/setup-python@v6
5858
with:
@@ -70,7 +70,7 @@ jobs:
7070
runs-on: ubuntu-latest
7171
steps:
7272
- name: "Checkout Repository"
73-
uses: actions/checkout@v5
73+
uses: actions/checkout@v6
7474
- name: "Setup Python"
7575
uses: actions/setup-python@v6
7676
with:
@@ -94,7 +94,7 @@ jobs:
9494
runs-on: ubuntu-latest
9595
steps:
9696
- name: "Checkout Repository"
97-
uses: actions/checkout@v5
97+
uses: actions/checkout@v6
9898
- name: "Setup Python"
9999
uses: actions/setup-python@v6
100100
with:
@@ -127,7 +127,7 @@ jobs:
127127
PYTHON: ${{ matrix.python-version }}
128128
steps:
129129
- name: "Checkout Repository"
130-
uses: actions/checkout@v5
130+
uses: actions/checkout@v6
131131
- name: "Setup Python"
132132
uses: actions/setup-python@v6
133133
with:

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: "Checkout Repository"
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535
with:
3636
fetch-depth: 0
3737
fetch-tags: true
@@ -108,7 +108,7 @@ jobs:
108108
GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
109109
steps:
110110
- name: "Checkout Repository"
111-
uses: actions/checkout@v5
111+
uses: actions/checkout@v6
112112
with:
113113
fetch-depth: 0
114114
fetch-tags: true
@@ -202,7 +202,7 @@ jobs:
202202
python3 -m build --sdist
203203
python3 -m build --wheel
204204
- name: "Create GitHub Release"
205-
uses: softprops/action-gh-release@v2.4.1
205+
uses: softprops/action-gh-release@v2.4.2
206206
id: gh-release
207207
with:
208208
tag_name: "v${{ inputs.version }}"
@@ -330,7 +330,7 @@ jobs:
330330
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
331331
steps:
332332
- name: "Checkout Repository"
333-
uses: actions/checkout@v5
333+
uses: actions/checkout@v6
334334
with:
335335
fetch-depth: 0
336336
fetch-tags: true

.github/workflows/todo-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: "Checkout Repository"
24-
uses: actions/checkout@v5
24+
uses: actions/checkout@v6
2525
- name: "Track TODO Action"
2626
uses: ribtoks/tdg-github-action@v0.4.15-beta
2727
with:

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repos:
2121
# - --remove-duplicate-keys
2222
# - --remove-unused-variables
2323
- repo: https://github.com/asottile/pyupgrade
24-
rev: v3.21.0
24+
rev: v3.21.2
2525
hooks:
2626
- id: pyupgrade
2727
exclude: \.(po|pot|yml|yaml)$
@@ -31,7 +31,7 @@ repos:
3131
- id: isort
3232
exclude: \.(po|pot|yml|yaml)$
3333
- repo: https://github.com/psf/black-pre-commit-mirror
34-
rev: 25.9.0
34+
rev: 25.11.0
3535
hooks:
3636
- id: black
3737
args: [--safe, --quiet]

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ These changes are available on the `master` branch, but have not yet been releas
2525
- Fixed `TypeError` in paginator implementation when only passing `PageGroup` objects
2626
and `show_menu` is falsy.
2727
([#2993](https://github.com/Pycord-Development/pycord/pull/2993))
28+
- Fixed breaking change in `ui.Select` Generic typing by adding default values to
29+
TypeVars. ([#3002](https://github.com/Pycord-Development/pycord/pull/3002))
2830

2931
### Deprecated
3032

0 commit comments

Comments
 (0)