Merge branch 'master' into feat/build-with-hatchling

Author: onerandomusername

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,8 +8,8 @@
 
 - [ ] If code changes were made, then they have been tested
     - [ ] I have updated the documentation to reflect the changes
-    - [ ] I have formatted the code properly by running `pdm run nox -s lint`
-    - [ ] I have type-checked the code by running `pdm run nox -s pyright`
+    - [ ] I have formatted the code properly by running `uv run nox -s lint`
+    - [ ] I have type-checked the code by running `uv run nox -s pyright`
 - [ ] This PR fixes an issue
 - [ ] This PR adds something new (e.g. new method or parameters)
 - [ ] This PR is a breaking change (e.g. methods or parameters removed/renamed)

.github/actions/cache-pdm/action.yml

@@ -5,7 +5,20 @@ description: .
 inputs:
   python-version:
     description: The python version to install
-    required: true
+    required: false
+    default: '3.8'
+  use-cached-uv-lock:
+    description: Whether to download the uv lock cache.
+    required: false
+    default: 'true'
+  update-uv-lock:
+    description: Whether to update the uv lock file. Allows the cache to fail.
+    required: false
+    default: 'false'
+  uv-resolution-strategy:
+    description: The uv resolution strategy to use. See https://docs.astral.sh/uv/reference/environment/#uv_resolution for details.
+    required: false
+    default: 'highest'
 outputs:
   python-version:
     description: The python version that was installed.
@@ -14,32 +27,52 @@ outputs:
 runs:
   using: composite
   steps:
-    - name: Set up pdm with python ${{ inputs.python-version }}
+    - name: Download uv lock
+      uses: actions/cache/restore@v4
+      if: ${{ inputs.use-cached-uv-lock != 'false' }}
+      id: restore-uv-lock
+      with:
+        key: uv-lock-resolved-${{ inputs.uv-resolution-strategy }}
+        path: uv.lock
+        restore-keys: |
+          uv-lock-resolved-${{ inputs.uv-resolution-strategy }}
+        enableCrossOsArchive: true
+        fail-on-cache-miss: ${{ inputs.update-uv-lock != 'true' }}
+
+    - name: Set up uv with python ${{ inputs.python-version }}
       id: setup-python
-      uses: pdm-project/setup-pdm@v4
+      uses: astral-sh/setup-uv@v6
       with:
+        version: '0.8.14'
+        enable-cache: true
+        # this doesn't install python but pins the uv version; its the same as providing UV_PYTHON
         python-version: ${{ inputs.python-version }}
-        version: "2.20.1"  # last version to support python 3.8
-        cache: false
 
-    - name: Disable PDM version check
+    - name: Install python ${{ inputs.python-version }}
       shell: bash
+      env:
+        UV_PYTHON_DOWNLOADS: automatic
       run: |
-        pdm config check_update false
+        uv python install ${{ inputs.python-version }}
 
-    - name: Ignore saved pythons
+    - name: Install nox
       shell: bash
       run: |
-        echo "PDM_IGNORE_SAVED_PYTHON=1" >> $GITHUB_ENV
+        uv tool install nox
 
-    - name: Install nox
+    - name: Lock dependencies
+      id: lock-uv-deps
+      if: ${{ inputs.update-uv-lock }}
       shell: bash
-      run: pip install nox
+      env:
+        UV_LOCKED: 0
+      run: uv lock --refresh
 
     - name: Set python version
       id: python-version
       shell: bash
-      run: echo "python-version=$(python -c 'import sys; print(".".join(map(str,sys.version_info[:2])))')" >> $GITHUB_OUTPUT
-
-    - name: Configure cache
-      uses: ./.github/actions/cache-pdm
+      env:
+        UV_VENV_CLEAR: 1
+      run: |
+        uv venv .venv
+        echo "python-version=$(uv run python -c 'import sys; print(".".join(map(str,sys.version_info[:2])))')" >> $GITHUB_OUTPUT

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

@@ -28,18 +28,19 @@ jobs:
           fetch-depth: '0'
 
       - name: Set up environment
+        id: setup-env
         uses: ./.github/actions/setup-env
         with:
-          python-version: '3.9'
+          update-uv-lock: true
 
       - name: Install dependencies
-        run: pdm install -dG changelog
+        run: uv sync --only-group changelog
 
       - name: Check for presence of a Change Log fragment (only pull requests)
         # NOTE: The pull request' base branch needs to be fetched so towncrier
         # is able to compare the current branch with the base branch.
         run: |
-          if ! pdm run towncrier check --compare-with origin/${BASE_BRANCH}; then
+          if ! uv run towncrier check --compare-with origin/${BASE_BRANCH}; then
             echo "::error::Please see https://github.com/DisnakeDev/disnake/blob/master/changelog/README.rst for details on how to create a changelog entry." >&2
             exit 1
           fi

.github/workflows/changelog.yaml

@@ -48,7 +48,7 @@ jobs:
           python-version: 3.8
 
       - name: Install dependencies
-        run: pdm install -dG changelog
+        run: uv sync --no-default-groups --group changelog
 
       - name: Update version
         run: |
@@ -57,7 +57,7 @@ jobs:
 
       - name: Build changelog
         run: |
-          pdm run towncrier build --yes --version "$VERSION_INPUT"
+          uv run towncrier build --yes --version "$VERSION_INPUT"
           git commit -a -m "docs: build changelog"
 
       - name: Create pull request