plac8 flake8-bugbear

Author: aaxelb

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: 22.8.0
+  rev: 26.1.0
   hooks:
   - id: black
     language_version: python3.11
 - repo: https://github.com/PyCQA/flake8
-  rev: 5.0.4
+  rev: 7.3.0
   hooks:
   - id: flake8
-    additional_dependencies: ["flake8-bugbear==22.8.23"]
+    additional_dependencies: ["flake8-bugbear==25.11.29"]
 - repo: https://github.com/asottile/blacken-docs
   rev: v1.12.1
   hooks:
   - id: blacken-docs
-    additional_dependencies: [black==22.8.0]
+    additional_dependencies: [black==26.1.0]

elasticsearch_metrics/djelmetrics_imps.py

@@ -24,22 +24,24 @@ def each_djelmetrics_imp() -> Iterator[ProtoDjelmetricsImp]:
 def get_djelmetrics_imp(imp_name: str) -> ProtoDjelmetricsImp:
     try:
         _raw_imp_config = settings.DJELMETRICS_IMPS[imp_name]
-    except KeyError:
-        raise ValueError(f"{imp_name!r} not found in `settings.DJELMETRICS_IMPS`")
+    except KeyError as _error:
+        raise ValueError(
+            f"{imp_name!r} not found in `settings.DJELMETRICS_IMPS`"
+        ) from _error
     try:
         _imp_path = _raw_imp_config["DJELMETRICS_IMP"]
-    except KeyError:
+    except KeyError as _error:
         raise ValueError(
             f"missing 'DJELMETRICS_IMP' from {imp_name!r} in `settings.DJELMETRICS_IMPS`"
             " -- must be a path to a djelme imp module like those under"
             "`elasticsearch_metrics.imps...`"
-        )
+        ) from _error
     try:
         _imp_module = importlib.import_module(_imp_path)
-    except ImportError:
+    except ImportError as _error:
         raise ValueError(
             f"could not import {_imp_path!r} for `settings.DJELMETRICS_IMPS[{imp_name!r}]`"
-        )
+        ) from _error
     assert isinstance(_imp_module, ProtoDjelmetricsImpModule)
     _imp_config = {
         _k: _v for _k, _v in _raw_imp_config.items() if _k != "DJELMETRICS_IMP"

elasticsearch_metrics/exceptions.py

@@ -5,12 +5,14 @@ class ElasticsearchMetricsError(Exception):
 class IndexTemplateNotFoundError(ElasticsearchMetricsError):
     def __init__(self, message, client_error):
         self.client_error = client_error
-        super(IndexTemplateNotFoundError, self).__init__(message)
+        super(IndexTemplateNotFoundError, self).__init__(message, client_error)
 
 
 class IndexTemplateOutOfSyncError(ElasticsearchMetricsError):
     def __init__(self, message, mappings_in_sync, patterns_in_sync, settings_in_sync):
         self.mappings_in_sync = mappings_in_sync
         self.patterns_in_sync = patterns_in_sync
         self.settings_in_sync = settings_in_sync
-        super(IndexTemplateOutOfSyncError, self).__init__(message)
+        super(IndexTemplateOutOfSyncError, self).__init__(
+            message, mappings_in_sync, patterns_in_sync, settings_in_sync
+        )

elasticsearch_metrics/field.py

@@ -25,4 +25,4 @@ class Date(edsl_field.Date):
 
     def __init__(self, default_timezone=None, *args, **kwargs):
         default_timezone = default_timezone or getattr(settings, "TIMEZONE", None)
-        super(Date, self).__init__(default_timezone=default_timezone, *args, **kwargs)
+        super(Date, self).__init__(*args, default_timezone=default_timezone, **kwargs)

elasticsearch_metrics/tests/_test_util.py

@@ -9,8 +9,7 @@
 
 
 class SimpleDjelmeTestCase(SimpleTestCase):
-    """SimpleDjelmeTestCase: base test case with djelme-specific conveniences
-    """
+    """SimpleDjelmeTestCase: base test case with djelme-specific conveniences"""
 
     def enterContext(self, context_manager):
         # TestCase.enterContext added in python3.11 -- implementing here until 3.10 eol
@@ -39,8 +38,8 @@ def run_mgmt_command(
 
 
 class RealElasticTestCase(SimpleDjelmeTestCase):
-    """RealElasticTestCase: base test case with actual elasticsearch running
-    """
+    """RealElasticTestCase: base test case with actual elasticsearch running"""
+
     __auto_setup_imps: bool
 
     def __init_subclass__(cls, /, auto_setup_imps: bool = True, **kwargs):

elasticsearch_metrics/tests/test_management_commands/test_sync_metrics.py

@@ -39,7 +39,9 @@ def test_with_connection(self):
             "default": {"hosts": "localhost:9201"},
             "alternate": {"hosts": "localhost:9202"},
         }
-        out, err = self.run_mgmt_command(sync_metrics.Command, "--connection", "alternate")
+        out, err = self.run_mgmt_command(
+            sync_metrics.Command, "--connection", "alternate"
+        )
         call_kwargs = self.mock_sync_index_template.call_args[1]
         assert call_kwargs["using"] == "alternate"
         assert "Using connection: 'alternate'" in out