Fix tests. Add makefile. Re-organise dependencies

Makefile

@@ -0,0 +1,14 @@
+
+dependencies:
+	pip install -r requirements.txt
+
+dependencies-dev:
+	pip install -r requirements-dev.txt
+
+mypy:
+	python -m mypy --strict --exclude build .
+
+test:
+	python -m pytest .
+
+.PHONY: dependencies dependencies-dev mypy test

challtools/validator.py

@@ -46,7 +46,7 @@ def set_defaults(validator, properties, instance, schema2):
 
 
 class Message(object):
-    def __init__(self, code, field, name, level, message):
+    def __init__(self, code: str, field, name: str, level: int, message: str):
         self.code = code
         self.field = field
         self.name = name
@@ -58,7 +58,7 @@ class ConfigValidator:
     def __init__(self, config, ctf_config=None, challdir=None):
         if not isinstance(config, dict):
             raise ValueError("Config parameter needs to be a dict")
-        self.messages = []
+        self.messages: List[Message] = []
         self.config = {}
         self.normalized_config = {}
         self.config = config
@@ -262,7 +262,7 @@ def validate(self) -> Tuple[bool, List[Message]]:
 
         return True, self.messages
 
-    def _raise_code(self, code, field=None, **formatting) -> None:
+    def _raise_code(self, code: str, field: str = None, **formatting) -> None:
         """Adds a formatted message entry into the messages array.
 
         Args:

requirements-dev.txt

@@ -0,0 +1,10 @@
+-r requirements.txt
+pytest
+pytest-cov
+
+types-flask
+types-jsonschema
+types-pkg_resources
+types-PyYAML
+types-requests
+types-setuptools

requirements.txt

@@ -1,12 +1,5 @@
 argcomplete
 docker
-pytest
+jsonschema
 pyyaml
-requests
-
-types-PyYAML
-types-jsonschema
-types-pkg_resources
-types-flask
-types-setuptools
-types-requests
+requests

tests/test_validator.py

@@ -19,7 +19,7 @@ def test_invalid(self):
 
         success, errors = validator.validate()
         assert not success
-        assert any([error["code"] == "A002" for error in errors])
+        assert any([error.code == "A002" for error in errors])
 
 
 class Test_A005:
@@ -30,7 +30,7 @@ def test_valid(self):
 
         success, errors = validator.validate()
         assert success
-        assert not any([error["code"] == "A005" for error in errors])
+        assert not any([error.code == "A005" for error in errors])
 
     def test_warn(self):
         config = get_min_valid_config()
@@ -39,7 +39,7 @@ def test_warn(self):
 
         success, errors = validator.validate()
         assert success
-        assert any([error["code"] == "A005" for error in errors])
+        assert any([error.code == "A005" for error in errors])
 
 
 class Test_A006:
@@ -54,7 +54,7 @@ def test_valid(self):
         success, errors = validator.validate()
 
         assert success
-        assert not any([error["code"] == "A006" for error in errors])
+        assert not any([error.code == "A006" for error in errors])
 
     def test_invalid(self):
         config = get_min_valid_config()
@@ -67,7 +67,7 @@ def test_invalid(self):
         success, errors = validator.validate()
 
         assert success
-        assert any([error["code"] == "A006" for error in errors])
+        assert any([error.code == "A006" for error in errors])
 
 
 class Test_A007:
@@ -84,7 +84,7 @@ def test_valid(self):
         success, errors = validator.validate()
 
         assert success
-        assert not any([error["code"] == "A007" for error in errors])
+        assert not any([error.code == "A007" for error in errors])
 
     def test_invalid(self):
         config = get_min_valid_config()
@@ -99,7 +99,7 @@ def test_invalid(self):
         success, errors = validator.validate()
 
         assert success
-        assert any([error["code"] == "A007" for error in errors])
+        assert any([error.code == "A007" for error in errors])
 
 
 class Test_A008:
@@ -112,7 +112,7 @@ def test_valid(self):
         success, errors = validator.validate()
 
         assert success
-        assert not any([error["code"] == "A008" for error in errors])
+        assert not any([error.code == "A008" for error in errors])
 
     def test_invalid(self):
         config = get_min_valid_config()
@@ -121,5 +121,7 @@ def test_invalid(self):
 
         success, errors = validator.validate()
 
+        print(errors)
+
         assert success
-        assert any([error["code"] == "A008" for error in errors])
+        assert any([error.code == "A008" for error in errors])