Merge branch 'main' into pre-commit-ci-update-config

.github/workflows/main.yml

@@ -7,17 +7,17 @@ env:
 
 jobs:
   test:
-    name: Test - ${{ matrix.python-version }}
+    name: Test - Python ${{ matrix.python-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }} & PDM
-        uses: pdm-project/setup-pdm@v3
+        uses: pdm-project/setup-pdm@v4
         with:
           python-version: ${{ matrix.python-version }}
           cache: true
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Validate links in Markdown files
         uses: JustinBeckwith/linkinator-action@v1
@@ -43,7 +43,7 @@ jobs:
           linksToSkip: "https://pypi.org/project/pelican-featured-image/"
 
       - name: Set up Python & PDM
-        uses: pdm-project/setup-pdm@v3
+        uses: pdm-project/setup-pdm@v4
         with:
           python-version: "3.10"
           cache: true
@@ -67,12 +67,12 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_TOKEN }}
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 

pyproject.toml

@@ -40,9 +40,8 @@ markdown = ["markdown>=3.4"]
 
 [tool.pdm.dev-dependencies]
 lint = [
-    "black>=23.10.1",
     "invoke>=2.2.0",
-    "ruff>=0.1.3",
+    "ruff>=0.3.5,<0.4.0"
 ]
 test = [
     "markdown>=3.4",
@@ -57,7 +56,7 @@ git-username = "botpub"
 git-email = "[email protected]"
 append-github-contributor = true
 
-[tool.ruff]
+[tool.ruff.lint]
 select = [
   "B",   # flake8-bugbear
   "BLE", # flake8-blind-except
@@ -92,7 +91,7 @@ ignore = [
   "RUF100",  # unused blanket `NOQA` directive
 ]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 combine-as-imports = true
 force-sort-within-sections = true
 known-first-party = ["pelican"]

tasks.py

@@ -32,17 +32,6 @@ def tests(c, deprecations=False):
     c.run(f"{CMD_PREFIX}pytest {deprecations_flag}", pty=PTY)
 
 
-@task
-def black(c, check=False, diff=False):
-    """Run Black auto-formatter, optionally with `--check` or `--diff`."""
-    check_flag, diff_flag = "", ""
-    if check:
-        check_flag = "--check"
-    if diff:
-        diff_flag = "--diff"
-    c.run(f"{CMD_PREFIX}black {check_flag} {diff_flag} {PKG_PATH} tasks.py", pty=PTY)
-
-
 @task
 def ruff(c, fix=False, diff=False):
     """Run Ruff to ensure code meets project standards."""
@@ -58,7 +47,6 @@ def ruff(c, fix=False, diff=False):
 def lint(c, fix=False, diff=False):
     """Check code style via linting tools."""
     ruff(c, fix=fix, diff=diff)
-    black(c, check=(not fix), diff=diff)
 
 
 @task