Skip to content

Commit 56c1ff9

Browse files
committed
Merge remote-tracking branch 'snipy/master' into feat/flags
2 parents b00e4d4 + 0b11905 commit 56c1ff9

File tree

206 files changed

+5383
-4823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+5383
-4823
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
22
/.github @DisnakeDev/maintainers
33
/scripts/ci @DisnakeDev/maintainers
4+
/noxfile.py @DisnakeDev/maintainers

.github/actions/setup-env/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
python-version:
77
description: The python version to install
88
required: false
9-
default: '3.9'
9+
default: '3.10'
1010
use-cached-uv-lock:
1111
description: Whether to download the uv lock cache.
1212
required: false
@@ -41,9 +41,9 @@ runs:
4141

4242
- name: Set up uv with Python ${{ inputs.python-version }}
4343
id: setup-python
44-
uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
44+
uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
4545
with:
46-
version: '0.8.14'
46+
version: '0.9.2'
4747
enable-cache: true
4848
# this doesn't install python but pins the uv version; its the same as providing UV_PYTHON
4949
python-version: ${{ inputs.python-version }}

.github/dependabot.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
version: 2
55
updates:
66
- package-ecosystem: "github-actions"
7-
directory: "/"
7+
directories:
8+
- "/"
9+
- "/.github/actions/*"
810
schedule:
911
interval: "weekly"
1012
open-pull-requests-limit: 1

.github/workflows/create-release-pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Set up environment
4646
uses: ./.github/actions/setup-env
4747
with:
48-
python-version: 3.9
48+
python-version: 3.10
4949

5050
- name: Install dependencies
5151
run: uv sync --no-default-groups --group changelog

.github/workflows/lint-test.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139

140140
- name: Run prek
141141
id: prek
142-
uses: j178/prek-action@e216c4c287eb0629a8f271855e990c2548d1464a # v1.0.6
142+
uses: j178/prek-action@91fd7d7cf70ae1dee9f4f44e7dfa5d1073fe6623 # v1.0.11
143143
# given the interoperability and the nature of prek, we stay unpinned for now
144144
# note that this action by default uses the latest version of prek
145145
# this is exactly how the pre-commit action worked, and we never had any issues
@@ -251,15 +251,12 @@ jobs:
251251
with:
252252
python-version: ${{ needs.python-versions.outputs.min-python }}
253253

254-
- name: Run slotscheck
255-
if: (success() || failure()) && steps.setup.outcome == 'success'
254+
- name: Run misc checks
256255
run: |
257-
nox -s slotscheck
256+
nox --tags misc
258257
259-
- name: Try building package
260-
if: (success() || failure()) && steps.setup.outcome == 'success'
258+
- name: List built files
261259
run: |
262-
nox -s build
263260
ls -la dist/
264261
265262
- name: Check README.md renders properly on PyPI
@@ -313,7 +310,7 @@ jobs:
313310
- lint
314311
strategy:
315312
matrix:
316-
os: ["windows-latest", "ubuntu-latest", "macos-latest"]
313+
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
317314
session: ${{ fromJson(needs.python-versions.outputs.test-sessions) }}
318315
fail-fast: true
319316
continue-on-error: ${{ matrix.session.experimental }}

.github/workflows/release.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
id: setup
2626
uses: ./.github/actions/setup-env
2727
with:
28-
python-version: 3.9
28+
python-version: 3.10
2929

3030
- name: Build package
3131
run: |
@@ -45,7 +45,7 @@ jobs:
4545
echo -e "\n</details>\n" >> $GITHUB_STEP_SUMMARY
4646
4747
- name: Upload artifact
48-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
48+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4949
with:
5050
name: dist
5151
path: dist/
@@ -65,7 +65,7 @@ jobs:
6565

6666
steps:
6767
- name: Download build artifact
68-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
68+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
6969
with:
7070
name: dist
7171
path: dist/
@@ -107,7 +107,7 @@ jobs:
107107

108108
steps:
109109
- name: Download build artifact
110-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
110+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
111111
with:
112112
name: dist
113113
path: dist/
@@ -121,7 +121,7 @@ jobs:
121121
echo "docs_version=${GIT_TAG//./-}" >> $GITHUB_OUTPUT
122122
123123
- name: Create Release
124-
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
124+
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
125125
with:
126126
files: dist/*
127127
draft: true
@@ -147,7 +147,7 @@ jobs:
147147

148148
steps:
149149
- name: Download build artifact
150-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
150+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
151151
with:
152152
name: dist
153153
path: dist/

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
55
# note that this version is ignored by prek when using the fastpath
6-
rev: v5.0.0
6+
rev: v6.0.0
77
hooks:
88
- id: check-case-conflict
99
- id: check-toml

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ formats:
66
build:
77
os: ubuntu-24.04
88
tools:
9-
python: "3.9"
9+
python: "3.10"
1010
jobs:
1111
create_environment:
1212
- asdf plugin add uv

MANIFEST.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include README.md
2-
include LICENSE
31
include disnake/bin/*
42
include disnake/py.typed
53
include disnake/ext/commands/py.typed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Key Features
2626
Installing
2727
----------
2828

29-
**Python 3.9 or higher is required.**
29+
**Python 3.10 or higher is required.**
3030

3131
To install the library without full voice support, you can just run the
3232
following command:

0 commit comments

Comments
 (0)