fix merge conflicts

tsantor · Jan 17, 2025 · c244f07 · c244f07
2 parents 597cf4b + 2193a66
commit c244f07
Show file tree

Hide file tree

Showing 37 changed files with 936 additions and 332 deletions.
diff --git a/.github/contributors.json b/.github/contributors.json
@@ -1664,5 +1664,25 @@
     "name": "Christian Jensen",
     "github_login": "jensenbox",
     "twitter_username": "cjensen"
+  },
+  {
+    "name": "Denis Darii",
+    "github_login": "DNX",
+    "twitter_username": ""
+  },
+  {
+    "name": "qwerrrqw",
+    "github_login": "qwerrrqw",
+    "twitter_username": ""
+  },
+  {
+    "name": "Pulse-Mind",
+    "github_login": "pulse-mind",
+    "twitter_username": ""
+  },
+  {
+    "name": "Hana Belay",
+    "github_login": "earthcomfy",
+    "twitter_username": ""
   }
 ]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,9 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: "true"
+        uses: astral-sh/setup-uv@v5
       - name: Install dependencies
         run: uv sync
       - name: Run tests
@@ -55,9 +53,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: "true"
+        uses: astral-sh/setup-uv@v5
       - name: Install dependencies
         run: uv sync
       - name: Docker ${{ matrix.script.name }}
@@ -102,13 +98,11 @@ jobs:
         with:
           python-version: "3.12"
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: "true"
+        uses: astral-sh/setup-uv@v5
       - name: Install dependencies
         run: uv sync
       - uses: actions/setup-node@v4
         with:
-          node-version: "22"
+          node-version: "22.13"
       - name: Bare Metal ${{ matrix.script.name }}
         run: sh tests/test_bare.sh ${{ matrix.script.args }}
diff --git a/.github/workflows/dependabot-uv-lock.yml b/.github/workflows/dependabot-uv-lock.yml
@@ -26,9 +26,7 @@ jobs:
         uses: actions/checkout@v4
         if: ${{ env.GH_PAT == '' }}
 
-      - uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: true
+      - uses: astral-sh/setup-uv@v5
       - run: uv lock
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:

diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
@@ -18,9 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: "true"
+        uses: astral-sh/setup-uv@v5
       - name: Create Django Major Issue
         run: uv run --frozen scripts/create_django_issue.py
         env:

diff --git a/.github/workflows/ruff-version.yml b/.github/workflows/ruff-version.yml
@@ -0,0 +1,37 @@
+name: ruff
+
+on:
+  pull_request:
+    paths:
+      - "{{cookiecutter.project_slug}}/requirements/local.txt"
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  version:
+    runs-on: ubuntu-latest
+    env:
+      GH_PAT: ${{ secrets.GH_PAT }}
+    steps:
+      - name: Checkout with token
+        uses: actions/checkout@v4
+        if: ${{ env.GH_PAT != '' }}
+        with:
+          token: ${{ env.GH_PAT }}
+          ref: ${{ github.head_ref }}
+
+      - name: Checkout without token
+        uses: actions/checkout@v4
+        if: ${{ env.GH_PAT == '' }}
+        with:
+          ref: ${{ github.head_ref }}
+
+      - uses: astral-sh/setup-uv@v5
+
+      - run: uv run scripts/ruff_version.py
+
+      - uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: Align Ruff versions
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -16,9 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: "true"
+        uses: astral-sh/setup-uv@v5
       - name: Set git details
         run: |
           git config --global user.name "github-actions"

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
@@ -19,9 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: "true"
+        uses: astral-sh/setup-uv@v5
       - name: Update list
         run: uv run --frozen scripts/update_contributors.py
         env:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,6 @@
 exclude: "{{cookiecutter.project_slug}}|.github/contributors.json|CHANGELOG.md|CONTRIBUTORS.md"
 default_stages: [pre-commit]
+minimum_pre_commit_version: "3.2.0"
 
 default_language_version:
   python: python3.12
@@ -26,7 +27,7 @@ repos:
         args: ["--tab-width", "2"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py312-plus]
@@ -52,6 +53,14 @@ repos:
     hooks:
       - id: pyproject-fmt
 
+  - repo: local
+    hooks:
+      - id: node-version-checker
+        name: node-version-checker
+        entry: python scripts/node_version.py
+        language: python
+        files: .
+
 ci:
   autoupdate_schedule: weekly
   skip: []