Merge pull request #1625 from wyardley/wyardley/chore/sort_and_setup.cfg

chore: remove isort and old setup.cfg

Author: jamesoff

.pre-commit-config.yaml

@@ -21,14 +21,6 @@ repos:
       - id: ruff
         args: [--fix]
       - id: ruff-format
-  - repo: https://github.com/asottile/seed-isort-config
-    rev: v2.2.0
-    hooks:
-      - id: seed-isort-config
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.9.2
-    hooks:
-      - id: isort
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.910
     hooks:

pyproject.toml

@@ -75,8 +75,14 @@ types-requests = "^2.31.0"
 types-pyOpenSSL = "^24.1.0"
 types-setuptools = "^75.6.0"
 
+[tool.mypy]
+ignore_missing_imports = true
+
 [tool.ruff.lint]
 ignore = ["F401"]
+# Ruff defaults (F + some E), as well as I (isort) and W.
+# Maybe consider adding some subset of "D" here as well
+select = ["E4", "E7", "E9", "F", "I", "W"]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

setup.cfg

@@ -2,14 +2,14 @@
 SimpleMonitor alerts via healthchecks
 """
 
+import json
 from typing import cast
 
-import json
 import requests
 
 from ..Monitors.monitor import Monitor
-from .alerter import Alerter, AlertLength, AlertType, register
 from ..util import check_group_match
+from .alerter import Alerter, AlertLength, AlertType, register
 
 
 @register

simplemonitor/Alerters/healthchecks.py

@@ -1,4 +1,4 @@
-from importlib_metadata import version  # compat lib for < 3.8
+from importlib.metadata import version
 
 # VERSION = pkg_resources.get_distribution("simplemonitor").version
 VERSION = version("simplemonitor")

simplemonitor/version.py

@@ -1,8 +1,8 @@
 import unittest
+from unittest.mock import Mock, patch
 
 from requests import Response
 from requests.auth import HTTPBasicAuth
-from unittest.mock import patch, Mock
 
 from simplemonitor.Monitors import MonitorHTTP
 from simplemonitor.util import MonitorState