Merge branch 'main' into ci/precommit

Borda · web-flow · commit fc67f410228c · 2024-10-16T10:55:23.000+02:00
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1 @@
+1f423a22d8b27926da7d7b7393c833da0f3714a4
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,9 +6,17 @@ updates:
       interval: "monthly"
     labels:
       - "type: Maintenance"
+    groups:
+      actions:
+        patterns:
+          - "*"
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
       interval: "monthly"
     labels:
       - "type: Maintenance"
+    groups:
+      actions:
+        patterns:
+          - "*"
diff --git a/.github/workflows/label-check.yaml b/.github/workflows/label-check.yaml
@@ -4,8 +4,10 @@ on:
   pull_request:
     types:
       - opened
+      - reopened
       - labeled
       - unlabeled
+      - synchronize
 
 env:
   LABELS: ${{ join( github.event.pull_request.labels.*.name, ' ' ) }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,10 @@
 name: test
 
-on: [push, pull_request]
+on: [workflow_dispatch, push, pull_request]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   default:
@@ -9,7 +13,16 @@ jobs:
       matrix:
         os: [ubuntu, macos, windows]
         python-version:
-          ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.8", "pypy-3.9"]
+          [
+            "3.8",
+            "3.9",
+            "3.10",
+            "3.11",
+            "3.12",
+            "3.13-dev",
+            "pypy-3.8",
+            "pypy-3.9",
+          ]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: c4a0b883114b00d8d76b479c820ce7950211c99b # frozen: v4.5.0
+    rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -32,13 +32,14 @@ repos:
         files: \.(html|md|yml|yaml|toml)
         args: [--prose-wrap=preserve]
 
-  - repo: https://github.com/psf/black
-    rev: 552baf822992936134cbd31a38f69c8cfe7c0f05 # frozen: 24.3.0
-    hooks:
-      - id: black
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 0ccbb5b7942d83fbcf7cb5e0fd99633efd2351d7 # frozen: v0.3.5
+    rev: 1dc9eb131c2ea4816c708e4d85820d2cc8542683 # frozen: v0.5.0
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args: ["--fix", "--show-fixes", "--exit-non-zero-on-fix"]
+      - id: ruff-format
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: "193cd7d27cd571f79358af09a8fb8997e54f8fff" # frozen: v2.3.0
+    hooks:
+      - id: codespell
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-[![PyPI](https://img.shields.io/pypi/v/lazy_loader)](https://pypi.org/project/lazy_loader/)
-[![Test status](https://github.com/scientific-python/lazy_loader/workflows/test/badge.svg?branch=main)](https://github.com/scientific-python/lazy_loader/actions?query=workflow%3A%22test%22)
-[![Test coverage](https://codecov.io/gh/scientific-python/lazy_loader/branch/main/graph/badge.svg)](https://app.codecov.io/gh/scientific-python/lazy_loader/branch/main)
+[![PyPI](https://img.shields.io/pypi/v/lazy-loader)](https://pypi.org/project/lazy-loader/)
+[![Test status](https://github.com/scientific-python/lazy-loader/workflows/test/badge.svg?branch=main)](https://github.com/scientific-python/lazy-loader/actions?query=workflow%3A%22test%22)
+[![Test coverage](https://codecov.io/gh/scientific-python/lazy-loader/branch/main/graph/badge.svg)](https://app.codecov.io/gh/scientific-python/lazy-loader/branch/main)
 
-`lazy_loader` makes it easy to load subpackages and functions on demand.
+`lazy-loader` makes it easy to load subpackages and functions on demand.
 
 ## Motivation
 
@@ -14,10 +14,10 @@ For a more detailed discussion, see [the SPEC](https://scientific-python.org/spe
 ## Installation
 
 ```
-pip install -U lazy_loader
+pip install -U lazy-loader
 ```
 
-We recommend using `lazy_loader` with Python >= 3.11.
+We recommend using `lazy-loader` with Python >= 3.11.
 If using Python 3.11, please upgrade to 3.11.9 or later.
 If using Python 3.12, please upgrade to 3.12.3 or later.
 These versions [avoid](https://github.com/python/cpython/pull/114781) a [known race condition](https://github.com/python/cpython/issues/114763).
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,4 +1,4 @@
-# Release process for `lazy_loader`
+# Release process for `lazy-loader`
 
 ## Introduction
 
@@ -17,7 +17,7 @@ Example `version number`
       export VERSION=<version number>
       export PREVIOUS=<previous version number>
       export ORG="scientific-python"
-      export REPO="lazy_loader"
+      export REPO="lazy-loader"
       export LOG="CHANGELOG.md"
 
 - Autogenerate release notes
@@ -46,17 +46,17 @@ Example `version number`
 
       git push --tags origin main
 
-  where `origin` is the name of the `github.com:scientific-python/lazy_loader`
+  where `origin` is the name of the `github.com:scientific-python/lazy-loader`
   repository
 
 - Create release from tag
 
-      - go to https://github.com/scientific-python/lazy_loader/releases/new?tag=v${VERSION}
+      - go to https://github.com/scientific-python/lazy-loader/releases/new?tag=v${VERSION}
       - add v${VERSION} for the `Release title`
       - paste contents (or upload) of ${VERSION}.md in the `Describe this release section`
       - if pre-release check the box labelled `Set as a pre-release`
 
-- Update https://github.com/scientific-python/lazy_loader/milestones:
+- Update https://github.com/scientific-python/lazy-loader/milestones:
 
       - close old milestone
       - ensure new milestone exists (perhaps setting due date)
diff --git a/lazy_loader/__init__.py b/lazy_loader/__init__.py
@@ -38,9 +38,7 @@ def attach(package_name, submodules=None, submod_attrs=None):
     The typical way to call this function, replacing the above imports, is::
 
       __getattr__, __dir__, __all__ = lazy.attach(
-        __name__,
-        ['mysubmodule', 'anothersubmodule'],
-        {'foo': ['someattr']}
+          __name__, ["mysubmodule", "anothersubmodule"], {"foo": ["someattr"]}
       )
 
     Parameters
@@ -114,7 +112,7 @@ def __getattr__(self, x):
             fd = self.__frame_data
             raise ModuleNotFoundError(
                 f"{self.__message}\n\n"
-                "This error is lazily reported, having originally occured in\n"
+                "This error is lazily reported, having originally occurred in\n"
                 f'  File {fd["filename"]}, line {fd["lineno"]}, in {fd["function"]}\n\n'
                 f'----> {"".join(fd["code_context"] or "").strip()}'
             )
@@ -162,7 +160,7 @@ def myfunc():
     fullname : str
         The full name of the module or submodule to import.  For example::
 
-          sp = lazy.load('scipy')  # import scipy as sp
+          sp = lazy.load("scipy")  # import scipy as sp
 
     require : str
         A dependency requirement as defined in PEP-508.  For example::
diff --git a/lazy_loader/tests/fake_pkg/some_func.py b/lazy_loader/tests/fake_pkg/some_func.py
@@ -1,3 +1,2 @@
 def some_func():
     """Function with same name as submodule."""
-    pass
diff --git a/lazy_loader/tests/test_lazy_loader.py b/lazy_loader/tests/test_lazy_loader.py
@@ -35,7 +35,7 @@ def test_lazy_import_subpackages():
     with pytest.warns(RuntimeWarning):
         hp = lazy.load("html.parser")
     assert "html" in sys.modules
-    assert type(sys.modules["html"]) == type(pytest)
+    assert type(sys.modules["html"]) is type(pytest)
     assert isinstance(hp, importlib.util._LazyModule)
     assert "html.parser" in sys.modules
     assert sys.modules["html.parser"] == hp
@@ -186,5 +186,6 @@ def test_parallel_load():
         [
             sys.executable,
             os.path.join(os.path.dirname(__file__), "import_np_parallel.py"),
-        ]
+        ],
+        check=True,
     )
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,35 +25,70 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-test = ["pytest >= 7.4", "pytest-cov >= 4.1"]
-lint = ["pre-commit == 3.7.0"]
+test = ["pytest >= 8.0", "pytest-cov >= 5.0"]
+lint = ["pre-commit == 3.8.0"]
 dev = ["changelist == 0.5"]
 
 [project.urls]
 Home = "https://scientific-python.org/specs/spec-0001/"
-Source = "https://github.com/scientific-python/lazy_loader"
+Source = "https://github.com/scientific-python/lazy-loader"
 
+[tool.setuptools.dynamic.version]
+attr = 'lazy_loader.__version__'
 
 [tool.changelist]
 ignored_user_logins = ["dependabot[bot]", "pre-commit-ci[bot]", "web-flow"]
 
-[tool.setuptools.dynamic.version]
-attr = 'lazy_loader.__version__'
+[tool.pytest.ini_options]
+minversion = "8.0"
+addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
+xfail_strict = true
+filterwarnings = ["error"]
+log_cli_level = "info"
 
 [tool.ruff]
-line-length = 88
 exclude = [
   "lazy_loader/tests/fake_pkg/__init__.pyi",
 ]
 
 [tool.ruff.lint]
-select = [
-    "C",
-    "E",
-    "F",
-    "W",
-    "B",
-    "I",
-    "UP",
+extend-select = [
+  "B",        # flake8-bugbear
+  "I",        # isort
+  "ARG",      # flake8-unused-arguments
+  "C4",       # flake8-comprehensions
+  "EM",       # flake8-errmsg
+  "ICN",      # flake8-import-conventions
+  "G",        # flake8-logging-format
+  "PGH",      # pygrep-hooks
+  "PIE",      # flake8-pie
+  "PL",       # pylint
+  "PT",       # flake8-pytest-style
+#  "PTH",      # flake8-use-pathlib
+  "RET",      # flake8-return
+  "RUF",      # Ruff-specific
+  "SIM",      # flake8-simplify
+  "T20",      # flake8-print
+  "UP",       # pyupgrade
+  "YTT",      # flake8-2020
+  "EXE",      # flake8-executable
+  "NPY",      # NumPy specific rules
+  "PD",       # pandas-vet
+  "FURB",     # refurb
+  "PYI",      # flake8-pyi
+]
+ignore = [
+  "PLR09",    # Too many <...>
+  "PLR2004",  # Magic value used in comparison
+  "ISC001",   # Conflicts with formatter
+  "B018",     # Found useless expression
+  "B028",     # No explicit `stacklevel` keyword argument found
+  "PT011",    # `pytest.raises(ValueError)` is too broad
+  "EM102",    # Exception must not use an f-string literal
+  "EM101",    # Exception must not use a string literal
+  "RET505",   # Unnecessary `elif` after `return` statement
+  "SIM108",   # Use ternary operator
 ]
-ignore = ["B018", "B028"]
+
+[tool.ruff.format]
+docstring-code-format = true

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+1f423a22d8b27926da7d7b7393c833da0f3714a4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`def some_func():`
`2`	`2`	`"""Function with same name as submodule."""`
`3`		`- pass`