Merge branch 'main' into 20241104-1006

pyproject.toml

@@ -42,10 +42,6 @@ pytest-xdist = '^3.1.0'
 black = '^24.1.0'
 mypy = '^1.0.1'
 py-githooks = '^1.1.1'
-flake8 = '^7.0.0'
-flake8-bugbear = '^24.0.0'
-flake8-builtins = '^2.1.0'
-flake8-comprehensions = '^3.10.1'
 twine = '^5.1.1'
 semver = '^3.0.0'
 setuptools-scm = '^8.0.0'
@@ -91,6 +87,9 @@ exclude_lines = ['pragma: no-cover', 'if TYPE_CHECKING:', '@abstractmethod']
 
 [tool.ruff.lint]
 extend-select = [
+  "A", # flake8-builtins
+  "B", # flake8-bugbear
+  "C4", # flake8-comprehensions
   "I", # isort
 ]
 

src/syrupy/__init__.py

@@ -40,7 +40,7 @@ def __import_extension(value: Optional[str]) -> Any:
     try:
         return import_module_member(value)
     except FailedToLoadModuleMember as e:
-        raise argparse.ArgumentTypeError(e)
+        raise argparse.ArgumentTypeError(e) from e
 
 
 def pytest_addoption(parser: Any) -> None:

src/syrupy/extensions/base.py

@@ -259,7 +259,7 @@ def _count_leading_whitespace(s: str) -> int:
     return len(s) - len(s.lstrip())
 
 
-class SnapshotReporter(ABC):
+class SnapshotReporter:
     _context_line_count = 1
 
     def diff_snapshots(

src/syrupy/utils.py

@@ -54,20 +54,20 @@ def import_module_member(path: str) -> Any:
         )
     try:
         module = import_module(module_name)
-    except ModuleNotFoundError:
+    except ModuleNotFoundError as e:
         raise FailedToLoadModuleMember(
             gettext("Module '{}' does not exist.").format(module_name)
-        )
+        ) from e
 
     try:
         return getattr(module, module_member_name)
-    except AttributeError:
+    except AttributeError as e:
         raise FailedToLoadModuleMember(
             gettext("Member '{}' not found in module '{}'.").format(
                 module_member_name,
                 module_name,
             )
-        )
+        ) from e
 
 
 def get_env_value(env_var_name: str) -> object:

tasks/lint.py

@@ -7,7 +7,6 @@
 
 lint_commands = {
     "black": lambda fix: f"python -m black {'' if fix else '--check'} .",
-    "flake8": lambda _: "python -m flake8 src tests benchmarks *.py",
     "mypy": lambda _: "python -m mypy --strict src benchmarks",
     "ruff": lambda fix: f"python -m ruff check {'--fix' if fix else ''} .",
 }
@@ -19,7 +18,7 @@ def run_lint(ctx, section, fix):
 
 
 @task(default=True)
-def all(ctx, fix=False):
+def all(ctx, fix=False):  # noqa: A001
     """
     Check and fix syntax using various linters
     """