Switched to Black-focused config

.flake8

@@ -1,5 +1,6 @@
 # vim: ft=cfg
 [flake8]
+max-line-length = 88
 max-complexity = 7
 docstring-convention=google
 

Makefile

@@ -4,7 +4,7 @@ PYTHON  := python3
 VENV    := .venv
 # Minimum % coverage for tests to succeed
 MIN_COV := 50
-SRC     := setup.py app tests
+SRC     := setup.py config_skeleton tests
 
 
 # =====GENERAL=====
@@ -34,18 +34,19 @@ venv: $(VENV)/bin/activate
 ## Formatting & linting
 ### Format the codebase using black
 format: venv
-	@ '$(VENV)'/bin/black $(SRC)
 	@ '$(VENV)'/bin/isort $(SRC)
+	@ '$(VENV)'/bin/black $(SRC)
 .PHONY: format
 
 ### Lint using black & flake8
 lint: venv
 	@ '$(VENV)'/bin/flake8 $(SRC)
 	@ '$(VENV)'/bin/black --check $(SRC)
+	@ '$(VENV)'/bin/isort --check $(SRC)
 .PHONY: lint
 
 
 ## Testing
 test: venv
-	@ '$(VENV)'/bin/pytest --cov=app --cov-fail-under='$(MIN_COV)' tests/
+	@ '$(VENV)'/bin/pytest --cov=config_skeleton --cov-fail-under='$(MIN_COV)' tests/
 .PHONY: test

app/__init__.py

@@ -1 +0,0 @@
-"""Main module for the app."""

config_skeleton/__init__.py

@@ -0,0 +1,11 @@
+"""Main module for the app."""
+from .exceptions import InvalidKeyError, InvalidValueError, MissingKeyError
+from .skeleton import merge, merge_with_skeleton
+
+__all__ = [
+    "InvalidKeyError",
+    "InvalidValueError",
+    "MissingKeyError",
+    "merge",
+    "merge_with_skeleton",
+]

config_skeleton/exceptions.py

@@ -48,8 +48,7 @@ class InvalidValueError(Exception):
             actual: name of the actual type
         """
         self.message = (
-            f"Invalid value for key {key}: expected {expected}, "
+            f"Invalid value for key {key}: expected {expected}, " f"got {actual}"
-            f"got {actual}"
         )
 
         super().__init__()

config_skeleton/skeleton.py

@@ -37,9 +37,7 @@ def merge(*dicts: [Dict]) -> Dict:
         if type(value) == dict:
             # Merge the two sub-dictionaries
             output[key] = (
-                merge(output[key], value)
+                merge(output[key], value) if type(output.get(key)) == dict else value
-                if type(output.get(key)) == dict
-                else value
             )
 
         else:

pyproject.toml

@@ -2,9 +2,6 @@
 requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
-[tool.black]
-line-length = 79
-
 [tool.isort]
 profile = "black"
 multi_line_output = 3

setup.cfg

@@ -3,7 +3,7 @@ name = config-skeleton
 version = 0.0.1
 
 [options]
-packages = app
+packages = config_skeleton
 install_requires =
 
 [options.extras_require]

tests/test_dict_merge.py

@@ -1,5 +1,5 @@
 """Tests for the skeleton module."""
-from app.skeleton import merge
+from config_skeleton import merge
 
 
 def test_merge_empty():

tests/test_skeleton.py

@@ -1,8 +1,7 @@
 """Tests wether the skeleton merge works."""
 import pytest
 
-from app.exceptions import InvalidKeyError, MissingKeyError
+from config_skeleton import InvalidKeyError, MissingKeyError, merge_with_skeleton
-from app.skeleton import merge_with_skeleton
 
 
 def test_single_invalid_key():