Merge pull request #109 from holdenweb/tidyup

Tidyup

Author: holdenweb

.github/workflows/lint.yaml

@@ -27,6 +27,6 @@ jobs:
           python -m pip install --upgrade pip poetry
           poetry install
       - name: Run Ruff
-        run: poetry run ruff check --output-format=github && poetry run pycodestyle src
+        run: poetry run ruff check --output-format=github
       - name: Run tests under Python ${{ matrix.python-version }}
         run: poetry run make test

Makefile

@@ -22,9 +22,8 @@ tox-test:
 build:
 	python build_hu.py
 
-style_check:
+style-check:
 	poetry run flake8 src && echo flake8 done
-	poetry run pycodestyle src && echo pycodestyle done
 
 watch-test:
 	@make test --silent || exit 0

poetry.lock

@@ -23,6 +23,7 @@ setuptools = "^75.6.0"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.8.4"
+black = "^24.10.0"
 
 [build-system]
 requires = ["poetry_core>=1.0.0"]

pyproject.toml

@@ -27,11 +27,9 @@ def _apply_key(self, o, k):
         except ValueError:
             raise KeyError("Non-integer list subscript")
         except IndexError:
-            raise KeyError(f'Invalid list index at end of "{k[: self.pos]}"')
+            raise KeyError(f'Invalid list index in "{k[: self.pos]}"')
         except KeyError:
-            raise KeyError(
-                'Unrecognised field name at end of "{}"'.format(k[: self.pos])
-            )
+            raise KeyError(f'Unrecognised field name in "{k[: self.pos]}"')
 
     def __getitem__(self, key):
         """

src/hu/dotted_dict.py

@@ -1,5 +1,4 @@
 import pytest
-
 from hu import DottedDict
 
 
@@ -19,7 +18,14 @@ def test_subscripts(dd):
 
 
 def test_fragments(dd):
-    assert list(dd._parse_path_key_spec("ab.cd[2][-1].ef.ij")) == ["ab", "cd", 2, -1, "ef", "ij"]
+    assert list(dd._parse_path_key_spec("ab.cd[2][-1].ef.ij")) == [
+        "ab",
+        "cd",
+        2,
+        -1,
+        "ef",
+        "ij",
+    ]
     assert list(dd._parse_path_key_spec("ab.cd[2].banana.ef.ij")) == [
         "ab",
         "cd",
@@ -46,7 +52,7 @@ def test_deletion(dd):
 def test_does_not_recursively_create_missing_structures():
     dd = DottedDict({"first": {"second": [{}, {}, {"third": "bingo"}]}})
     with pytest.raises(KeyError):
-        dd['missing.element'] = None
+        dd["missing.element"] = None
 
 
 def test_name_patterns(dd):