update template

iterative · Mar 4, 2024 · 6cace68 · 6cace68
1 parent 7215e84
commit 6cace68
Show file tree

Hide file tree

Showing 18 changed files with 216 additions and 186 deletions.
diff --git a/.cruft.json b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/iterative/py-template",
-  "commit": "15ee26df315020399731c6291d61bef81a3fc5d3",
+  "commit": "e4ec95f4cfd03d4af0a8604d462ee11d07d63b42",
   "context": {
     "cookiecutter": {
       "project_name": "dvc-render",

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,23 +7,10 @@ updates:
       interval: "weekly"
     labels:
       - "maintenance"
-    # Update via cruft
-    ignore:
-      - dependency-name: "mkdocs*"
-      - dependency-name: "pytest*"
-      - dependency-name: "pylint"
-      - dependency-name: "mypy"
 
   - directory: "/"
     package-ecosystem: "github-actions"
     schedule:
       interval: "weekly"
     labels:
       - "maintenance"
-    # Update via cruft
-    ignore:
-      - dependency-name: "actions/checkout"
-      - dependency-name: "actions/setup-python"
-      - dependency-name: "pypa/gh-action-pypi-publish"
-      - dependency-name: "codecov/codecov-action"
-      - dependency-name: "peter-evans/create-pull-request"
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,25 +16,25 @@ jobs:
       id-token: write
     runs-on: ubuntu-latest
     steps:
-    - name: Check out the repository
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
+      - name: Check out the repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.10'
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
 
-    - name: Upgrade pip and nox
-      run: |
-        pip install --upgrade pip nox
-        pip --version
-        nox --version
+      - name: Upgrade pip and nox
+        run: |
+          pip install --upgrade pip nox
+          pip --version
+          nox --version
 
-    - name: Build package
-      run: nox -s build
+      - name: Build package
+        run: nox -s build
 
-    - name: Upload package
-      if: github.event_name == 'release'
-      uses: pypa/gh-action-pypi-publish@release/v1
+      - name: Upload package
+        if: github.event_name == 'release'
+        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -21,38 +21,39 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, windows-latest, macos-latest]
-        pyv: ['3.8', '3.9', '3.10', '3.11']
+        pyv: ['3.9', '3.10', '3.11', '3.12']
         include:
-        - {os: ubuntu-latest, pyv: 'pypy3.8'}
+          - {os: ubuntu-latest, pyv: 'pypy3.8'}
 
     steps:
-    - name: Check out the repository
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
+      - name: Check out the repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-    - name: Set up Python ${{ matrix.pyv }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.pyv }}
+      - name: Set up Python ${{ matrix.pyv }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.pyv }}
 
-    - name: Upgrade pip and nox
-      run: |
-        python -m pip install --upgrade pip nox
-        pip --version
-        nox --version
+      - name: Upgrade pip and nox
+        run: |
+          python -m pip install --upgrade pip nox
+          pip --version
+          nox --version
 
-    - name: Lint code and check dependencies
-      run: nox -s lint safety
+      - name: Lint code and check dependencies
+        run: nox -s lint safety
 
-    - name: Run tests
-      run: nox -s tests-${{ matrix.nox_pyv || matrix.pyv }} -- --cov-report=xml
+      - name: Run tests
+        run: nox -s tests-${{ matrix.nox_pyv || matrix.pyv }} -- --cov-report=xml
 
-    - name: Upload coverage report
-      uses: codecov/codecov-action@v3.1.4
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v3
 
-    - name: Build package
-      run: nox -s build
+      - name: Build package
+        run: nox -s build
 
-    - name: Build docs
-      run: nox -s docs
+
+      - name: Build docs
+        run: nox -s docs
diff --git a/.github/workflows/update-template.yaml b/.github/workflows/update-template.yaml
@@ -9,8 +9,8 @@ jobs:
   update:
     runs-on: ubuntu-latest
     steps:
-    - name: Check out the repository
-      uses: actions/checkout@v4
+      - name: Check out the repository
+        uses: actions/checkout@v4
 
-    - name: Update template
-      uses: iterative/py-template@main
+      - name: Update template
+        uses: iterative/py-template@main
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,14 +13,13 @@ repos:
         args: ['--assume-in-merge']
       - id: check-toml
       - id: check-yaml
-      - id: debug-statements
       - id: end-of-file-fixer
       - id: mixed-line-ending
         args: ['--fix=lf']
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.1.7'
+    rev: 'v0.3.0'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -30,3 +29,10 @@ repos:
     hooks:
       - id: codespell
         additional_dependencies: ["tomli"]
+  - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+    rev: v2.12.0
+    hooks:
+      - id: pretty-format-toml
+        args: [--autofix, --no-sort]
+      - id: pretty-format-yaml
+        args: [--autofix, --indent, '2', '--offset', '2', --preserve-quotes]
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -19,15 +19,15 @@ extra:
       link: https://github.com/iterative/
 
 plugins:
-- search
-- gen-files:
-    scripts:
-    - docs/gen_ref_pages.py
-- section-index
-- mkdocstrings:
-    handlers:
-      python:
-        rendering:
-          show_submodules: no
-    watch:
-    - src/dvc_render
+  - search
+  - gen-files:
+      scripts:
+        - docs/gen_ref_pages.py
+  - section-index
+  - mkdocstrings:
+      handlers:
+        python:
+          rendering:
+            show_submodules: no
+      watch:
+        - src/dvc_render
diff --git a/noxfile.py b/noxfile.py
@@ -1,4 +1,5 @@
 """Automation using nox."""
+
 import glob
 import os
 
@@ -15,7 +16,7 @@ def docs(session: nox.Session) -> None:
     session.run("mkdocs", "build")
 
 
-@nox.session(python=["3.8", "3.9", "3.10", "3.11", "pypy3.8", "pypy3.9"])
+@nox.session(python=["3.9", "3.10", "3.11", "3.12", "pypy3.9"])
 def tests(session: nox.Session) -> None:
     session.install(".[tests]")
     session.run(