Merge remote-tracking branch 'upstream/main'

Author: hugovk

.github/dependabot.yml

@@ -1,7 +1,9 @@
 version: 2
 updates:
   - package-ecosystem: "pip"
-    directory: "/pyperformance/requirements"
+    directory: "/"
+    exclude-paths:
+      - "pyperformance/data-files/**"
     schedule:
       interval: "monthly"
   # Don't update test dependencies for reproducibility.

.pre-commit-config.yaml

@@ -1,21 +1,18 @@
+exclude: ^pyperformance/data-files/
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.12.11
     hooks:
       - id: ruff-check
         name: Run Ruff (lint)
         args: [--exit-non-zero-on-fix]
-        exclude: ^pyperformance/data-files/
 
   - repo: https://github.com/tox-dev/pyproject-fmt
     rev: v2.6.0
     hooks:
       - id: pyproject-fmt
-        exclude: ^pyperformance/data-files/
 
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.24.1
     hooks:
       - id: validate-pyproject
-        exclude: ^pyperformance/data-files/
-

pyperformance/_manifest.py

@@ -313,8 +313,8 @@ def _parse_benchmarks_section(lines):
     version = origin = None
     for line in lines:
         try:
-            name, metafile = (None if l == '-' else l
-                              for l in line.split('\t'))
+            name, metafile = (None if field == '-' else field
+                              for field in line.split('\t'))
         except ValueError:
             raise ValueError(f'bad benchmark line {line!r}')
         spec = _benchmark.BenchmarkSpec(name or None, version, origin)

pyperformance/_utils.py

@@ -24,6 +24,8 @@
 import os.path
 import shlex
 import shutil
+import subprocess
+import sys
 import tempfile
 import urllib.request
 
@@ -81,9 +83,6 @@ def safe_rmtree(path):
 #######################################
 # platform utils
 
-import subprocess
-import sys
-
 
 MS_WINDOWS = (sys.platform == 'win32')
 

pyperformance/_venv.py

@@ -43,7 +43,7 @@ def parse_venv_config(lines, root=None):
     if isinstance(lines, str):
         lines = lines.splitlines()
     else:
-        lines = (l.rstrip(os.linesep) for l in lines)
+        lines = (line.rstrip(os.linesep) for line in lines)
 
     cfg = types.SimpleNamespace(
         home=None,

pyperformance/tests/test_venv.py

@@ -47,7 +47,7 @@ def render_venv_config(cfg):
         lines.append(f'executable = {cfg.executable}')
     if cfg.command is not None:
         lines.append(f'command = {cfg.command}')
-    return ''.join(l + os.linesep for l in lines)
+    return ''.join(line + os.linesep for line in lines)
 
 
 class VenvConfigTests(tests.Functional, unittest.TestCase):

pyproject.toml

@@ -102,12 +102,7 @@ lint.select = [
   "F", # pyflakes errors
 ]
 lint.ignore = [
-  "E402", # module level import not at top of file
   "E501", # line too long
-  "E701", # multiple statements on one line (colon)
-  "E722", # do not use bare 'except'
-  "E741", # ambiguous variable name
-  "F405", # name may be undefined, or defined from star imports
 ]
 
 [tool.pyproject-fmt]