Use more ruff instead of flake8 and pyupgrade (#358)

Author: farmio

.pre-commit-config.yaml

@@ -7,16 +7,6 @@ repos:
         additional_dependencies:
           - tomli
         exclude_types: [csv, json]
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
-    hooks:
-      - id: pyupgrade
-        args: [--py39-plus]
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
-    hooks:
-      - id: flake8
-        files: ^(xknxproject|examples|docs)/.+\.py$
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     # Ruff version.
     rev: 'v0.1.11'

pyproject.toml

@@ -103,26 +103,42 @@ output-format = "colorized"
 testpaths = "test"
 
 [tool.ruff]
-target-version = "py39"
-select = [
-  "C4",  # comprehensions
-  "D",   # pydocstyle
-  "E",   # pycodestyle
-  "F",   # pyflakes
-  "I",   # isort
-  "RUF", # ruff specific
-  "T20", # print
-  "UP",  # pyupgrade
-  "W",   # pydocstyle warning
+lint.select = [
+  "A",     # builtins shadowing
+  "ASYNC", # async
+  "B",     # bugbear
+  "C4",    # comprehensions
+  "D",     # pydocstyle
+  "E",     # pycodestyle
+  "F",     # pyflakes
+  "G",     # logging
+  "I",     # isort
+  "LOG",   # logging
+  "PTH",   # pathlib
+  "RUF",   # ruff specific
+  "SLF",   # private member access
+  "SIM",   # simplify
+  "T20",   # print
+  "UP",    # pyupgrade
+  "W",     # pydocstyle warning
 ]
-ignore = [
+lint.ignore = [
   "D202",
   "D203",
   "D212",
-  "E501", # line too long
+  "E501",   # line too long
+  "SIM102", # collapsible-if
+  "SIM105", #suppressible-exception
 ]
 extend-exclude = ["script"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 force-sort-within-sections = true
 combine-as-imports = true
+
+[tool.ruff.lint.per-file-ignores]
+"test/*" = [
+  "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
+  "SLF",    # private member access
+  "SIM117", # multiple-with-statements
+]

requirements_testing.txt

@@ -1,6 +1,5 @@
 -r requirements_production.txt
 pre-commit==3.6.0
-flake8==7.0.0
 pylint==3.0.3
 pytest==8.0.0
 pytest-cov==4.1.0

setup.cfg

@@ -15,12 +15,12 @@ def remove_xknxproject_version(obj: KNXProject) -> KNXProject:
         assert len(version_string.split(".")) == 3
         return obj
 
-    with open(stub_path, encoding="utf-8") as stub_file:
+    with stub_path.open(encoding="utf-8") as stub_file:
         stub = remove_xknxproject_version(json.load(stub_file))
         to_be_verified = remove_xknxproject_version(to_be_verified)
         for key, value in stub.items():
             assert key in to_be_verified, f"`{key}` key missing in generated object"
             assert value == to_be_verified[key], f"`{key}` item does not match"
 
-        for key in to_be_verified.keys():
+        for key in to_be_verified:
             assert key in stub, f"`{key}` key of generated object missing in stub"

test/conftest.py

@@ -22,8 +22,6 @@ wheel_build_env = .pkg
 basepython = python3
 commands =
     pre-commit run codespell {posargs: --all-files}
-    pre-commit run flake8 {posargs: --all-files}
-    pre-commit run pyupgrade {posargs: --all-files}
     pre-commit run check-json {posargs: --all-files}
     pre-commit run trailing-whitespace {posargs: --all-files}
 

tox.ini

@@ -30,14 +30,14 @@ def parse_dpt_types(dpt_string: str | None) -> list[DPTType]:
     for _dpt in dict.fromkeys(dpt_string.split()):
         dpt_parts = _dpt.split("-")
         try:
-            if MAIN_DPT == dpt_parts[0]:
+            if dpt_parts[0] == MAIN_DPT:
                 supported_dpts.append(
                     DPTType(
                         main=int(dpt_parts[1]),
                         sub=None,
                     )
                 )
-            if MAIN_AND_SUB_DPT == dpt_parts[0]:
+            if dpt_parts[0] == MAIN_AND_SUB_DPT:
                 supported_dpts.append(
                     DPTType(
                         main=int(dpt_parts[1]),

xknxproject/util.py

@@ -152,7 +152,9 @@ def _get_xml_namespace(project_zip: ZipFile) -> str:
                     namespace = namespace_match.group(1)  # type: ignore[union-attr]
                 except (AttributeError, IndexError, UnicodeDecodeError):
                     _LOGGER.error("Could not parse XML namespace from %s", line)
-                    raise UnexpectedFileContent("Could not parse XML namespace.")
+                    raise UnexpectedFileContent(
+                        "Could not parse XML namespace."
+                    ) from None
 
         _LOGGER.debug("Namespace: %s", namespace)
         return namespace
@@ -164,7 +166,7 @@ def _get_schema_version(namespace: str) -> int:
         schema_version = int(namespace.split("/")[-1])
     except ValueError:
         _LOGGER.error("Could not parse schema version from %s", namespace)
-        raise UnexpectedFileContent("Could not parse schema version.")
+        raise UnexpectedFileContent("Could not parse schema version.") from None
 
     _LOGGER.debug("Schema version: %s", schema_version)
     return schema_version