Remove GitHub attestation and update config/linting/spelling (#474)

hugovk · web-flow · commit a97c865ee383 · 2025-02-20T15:14:18.000+02:00
diff --git a/.coveragerc b/.coveragerc
@@ -4,8 +4,9 @@
 # Regexes for lines to exclude from consideration
 exclude_also =
     # Don't complain if non-runnable code isn't run:
-    if __name__ == .__main__.:
     def main
+    if __name__ == .__main__.:
+    if TYPE_CHECKING:
 
 [run]
 omit =
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base"],
+  "extends": ["config:base", ":semanticCommitsDisabled"],
   "labels": ["changelog: skip", "dependencies"],
   "packageRules": [
     {
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -41,7 +41,6 @@ jobs:
     needs: build-package
 
     permissions:
-      attestations: write
       id-token: write
 
     steps:
@@ -51,11 +50,6 @@ jobs:
           name: Packages
           path: dist
 
-      - name: Attest build provenance
-        uses: actions/attest-build-provenance@v2
-        with:
-          subject-path: "dist/*"
-
       - name: Upload package to Test PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
@@ -71,7 +65,6 @@ jobs:
     needs: build-package
 
     permissions:
-      attestations: write
       id-token: write
 
     steps:
@@ -81,10 +74,5 @@ jobs:
           name: Packages
           path: dist
 
-      - name: Attest build provenance
-        uses: actions/attest-build-provenance@v2
-        with:
-          subject-path: "dist/*"
-
       - name: Upload package to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -2,10 +2,11 @@ name: Lint
 
 on: [push, pull_request, workflow_dispatch]
 
+permissions: {}
+
 env:
   FORCE_COLOR: 1
-
-permissions: {}
+  RUFF_OUTPUT_FORMAT: github
 
 jobs:
   lint:
diff --git a/.github/workflows/require-pr-label.yml b/.github/workflows/require-pr-label.yml
@@ -17,6 +17,11 @@ jobs:
         with:
           mode: minimum
           count: 1
-          labels:
-            "changelog: Added, changelog: Changed, changelog: Deprecated, changelog:
-            Fixed, changelog: Removed, changelog: Security, changelog: skip"
+          labels: |
+            changelog: Added
+            changelog: Changed
+            changelog: Deprecated
+            changelog: Fixed
+            changelog: Removed
+            changelog: Security
+            changelog: skip
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["pypy3.10", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["pypy3.11", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
         os: [windows-latest, macos-latest, ubuntu-latest]
 
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.2
+    rev: v0.9.6
     hooks:
       - id: ruff
         args: [--exit-non-zero-on-fix]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black
 
@@ -16,6 +16,7 @@ repos:
       - id: check-added-large-files
       - id: check-case-conflict
       - id: check-merge-conflict
+      - id: check-shebang-scripts-are-executable
       - id: check-json
       - id: check-toml
       - id: check-yaml
@@ -27,7 +28,7 @@ repos:
         exclude: tests/data/expected_tabulated.py
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.31.0
+    rev: 0.31.2
     hooks:
       - id: check-github-workflows
       - id: check-renovate
@@ -38,7 +39,7 @@ repos:
       - id: actionlint
 
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.2.2
+    rev: v1.3.1
     hooks:
       - id: zizmor
 
@@ -53,15 +54,21 @@ repos:
       - id: validate-pyproject
 
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.4.1
+    rev: 1.5.0
     hooks:
       - id: tox-ini-fmt
 
+  - repo: https://github.com/google/yamlfmt
+    rev: v0.16.0
+    hooks:
+      - id: yamlfmt
+
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.4.2
+    rev: v3.5.1
     hooks:
       - id: prettier
         args: [--prose-wrap=always, --print-width=88]
+        exclude_types: [yaml]
 
   - repo: meta
     hooks:
diff --git a/.yamlfmt.yaml b/.yamlfmt.yaml
@@ -0,0 +1,2 @@
+formatter:
+  retain_line_breaks_single: true
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![PyPI downloads](https://img.shields.io/pypi/dm/pypistats.svg)](https://pypistats.org/packages/pypistats)
 [![Azure Pipelines status](https://dev.azure.com/hugovk/hugovk/_apis/build/status/hugovk.pypistats?branchName=main)](https://dev.azure.com/hugovk/hugovk/_build?definitionId=1)
 [![GitHub Actions status](https://github.com/hugovk/pypistats/workflows/Test/badge.svg)](https://github.com/hugovk/pypistats/actions)
-[![codecov](https://codecov.io/gh/hugovk/pypistats/branch/main/graph/badge.svg)](https://codecov.io/gh/hugovk/pypistats)
+[![Codecov](https://codecov.io/gh/hugovk/pypistats/branch/main/graph/badge.svg)](https://codecov.io/gh/hugovk/pypistats)
 [![Licence](https://img.shields.io/github/license/hugovk/pypistats.svg)](LICENSE.txt)
 [![DOI](https://zenodo.org/badge/149862343.svg)](https://zenodo.org/badge/latestdoi/149862343)
 [![Code style: Black](https://img.shields.io/badge/code%20style-Black-000000.svg)](https://github.com/psf/black)
diff --git a/RELEASING.md b/RELEASING.md
@@ -1,4 +1,4 @@
-# Release Checklist
+# Release checklist
 
 - [ ] Get `main` to the appropriate code release state.
       [GitHub Actions](https://github.com/hugovk/pypistats/actions) should be running
diff --git a/example/example.py b/example/example.py
@@ -1,7 +1,7 @@
-#!/usr/bin/env python3
 """
 Example use of pypistats
 """
+
 from __future__ import annotations
 
 import argparse
diff --git a/pyproject.toml b/pyproject.toml
@@ -78,12 +78,14 @@ lint.select = [
   "C4",     # flake8-comprehensions
   "E",      # pycodestyle errors
   "EM",     # flake8-errmsg
-  "F",      # pyflakes errors
+  "F",      # pyflakes
   "I",      # isort
   "ICN",    # flake8-import-conventions
   "ISC",    # flake8-implicit-str-concat
   "LOG",    # flake8-logging
   "PGH",    # pygrep-hooks
+  "PIE",    # flake8-pie
+  "PT",     # flake8-pytest-style
   "PYI",    # flake8-pyi
   "RUF022", # unsorted-dunder-all
   "RUF100", # unused noqa (yesqa)
@@ -92,13 +94,16 @@ lint.select = [
   "YTT",    # flake8-2020
 ]
 lint.ignore = [
-  "E203", # Whitespace before ':'
-  "E221", # Multiple spaces before operator
-  "E226", # Missing whitespace around arithmetic operator
-  "E241", # Multiple spaces after ','
+  "E203",   # Whitespace before ':'
+  "E221",   # Multiple spaces before operator
+  "E226",   # Missing whitespace around arithmetic operator
+  "E241",   # Multiple spaces after ','
+  "PIE790", # flake8-pie: unnecessary-placeholder
+  "UP038",  # Makes code slower and more verbose
 ]
 lint.flake8-import-conventions.aliases.datetime = "dt"
 lint.flake8-import-conventions.banned-from = [ "datetime" ]
+lint.flake8-pytest-style.parametrize-names-type = "csv"
 lint.isort.known-first-party = [ "pypistats" ]
 lint.isort.required-imports = [ "from __future__ import annotations" ]
 
diff --git a/src/pypistats/cli.py b/src/pypistats/cli.py
@@ -1,18 +1,21 @@
-#!/usr/bin/env python3
 """
 CLI with subcommands for pypistats
 """
+
 from __future__ import annotations
 
 import argparse
 import datetime as dt
 import re
-from typing import Any
 
 from dateutil.relativedelta import relativedelta
 
 import pypistats
 
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Any
+
 cli = argparse.ArgumentParser()
 subparsers = cli.add_subparsers(dest="subcommand")
 
diff --git a/tox.ini b/tox.ini
@@ -38,7 +38,7 @@ commands =
 [testenv:lint]
 skip_install = true
 deps =
-    pre-commit
+    pre-commit-uv
 pass_env =
     PRE_COMMIT_COLOR
 commands =

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://docs.renovatebot.com/renovate-schema.json",`
`3`		`- "extends": ["config:base"],`
	`3`	`+ "extends": ["config:base", ":semanticCommitsDisabled"],`
`4`	`4`	`"labels": ["changelog: skip", "dependencies"],`
`5`	`5`	`"packageRules": [`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+formatter:`
	`2`	`+ retain_line_breaks_single: true`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Release Checklist`
	`1`	`+# Release checklist`
`2`	`2`
`3`	`3`	- [ ] Get `main` to the appropriate code release state.
`4`	`4`	`[GitHub Actions](https://github.com/hugovk/pypistats/actions) should be running`