Various improvements

.editorconfig

@@ -30,7 +30,7 @@ ij_json_spaces_within_brackets = false
 ij_json_wrap_long_lines = false
 
 [{*.py,*.pyw}]
-max_line_length = 84
+max_line_length = 88
 ij_python_align_collections_and_comprehensions = true
 ij_python_align_multiline_imports = true
 ij_python_align_multiline_parameters = true

.github/workflows/ci.yml

@@ -46,7 +46,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: isort/isort-action@v1.0.0
+        with:
+          sortPaths: "./tested ./tests"
       - uses: psf/black@stable
         with:
-          version: "~= 22.0"
+          version: "~= 23.0"
           src: "./tested ./tests"

pyproject.toml

@@ -0,0 +1,8 @@
+[tool.isort]
+profile = "black"
+
+[tool.pylint.format]
+max-line-length = "88"
+
+[tool.black]
+line-length = 88

tested/__main__.py

@@ -1,9 +1,10 @@
 import logging
 import sys
 from argparse import ArgumentParser, FileType
-from .configs import read_config
-from .utils import smart_close
-from .main import run
+
+from tested.configs import read_config
+from tested.main import run
+from tested.utils import smart_close
 
 parser = ArgumentParser(
     description="The programming-language-agnostic educational test framework."

tested/configs.py

@@ -6,13 +6,13 @@
 import logging
 from dataclasses import field
 from pathlib import Path
-from typing import Optional, Dict, IO, TYPE_CHECKING, Any
+from typing import IO, TYPE_CHECKING, Any, Dict, Optional
 
 from pydantic import BaseModel, root_validator
 from pydantic.dataclasses import dataclass
 
-from .testsuite import Suite, ExecutionMode
-from .utils import smart_close, consume_shebang, get_identifier
+from tested.testsuite import ExecutionMode, Suite
+from tested.utils import consume_shebang, get_identifier, smart_close
 
 # Prevent circular imports
 if TYPE_CHECKING:

tested/datatypes/__init__.py

@@ -12,12 +12,26 @@
 Additionally, the types in this file are organized by their JSON encoding type.
 They are also split in "basic types" and "advanced types".
 """
-from typing import Set, Tuple, FrozenSet
-
-from .advanced import *
-from .basic import *
-from .complex import *
-from ..utils import get_args
+from typing import FrozenSet, Set, Tuple, Union
+
+from tested.datatypes.advanced import (
+    AdvancedNothingTypes,
+    AdvancedNumericTypes,
+    AdvancedSequenceTypes,
+    AdvancedStringTypes,
+    AdvancedTypes,
+)
+from tested.datatypes.basic import (
+    BasicBooleanTypes,
+    BasicNothingTypes,
+    BasicNumericTypes,
+    BasicObjectTypes,
+    BasicSequenceTypes,
+    BasicStringTypes,
+    BasicTypes,
+)
+from tested.datatypes.complex import ComplexExpressionTypes
+from tested.utils import get_args
 
 NumericTypes = Union[BasicNumericTypes, AdvancedNumericTypes]
 StringTypes = Union[BasicStringTypes, AdvancedStringTypes]
@@ -26,13 +40,11 @@
 SequenceTypes = Union[BasicSequenceTypes, AdvancedSequenceTypes]
 ObjectTypes = Union[BasicObjectTypes]
 
-
 SimpleTypes = Union[NumericTypes, StringTypes, BooleanTypes, NothingTypes]
 ComplexTypes = Union[SequenceTypes, ObjectTypes]
 
 AllTypes = Union[BasicTypes, AdvancedTypes]
 
-
 ExpressionTypes = Union[AllTypes, ComplexExpressionTypes]
 NestedTypes = Set[Tuple[ExpressionTypes, FrozenSet[ExpressionTypes]]]
 

tested/datatypes/advanced.py

@@ -7,12 +7,12 @@
 from enum import Enum
 from typing import Union
 
-from .basic import (
+from tested.datatypes.basic import (
+    BasicNothingTypes,
     BasicNumericTypes,
     BasicSequenceTypes,
-    BasicTypes,
     BasicStringTypes,
-    BasicNothingTypes,
+    BasicTypes,
 )
 
 

tested/description_instance.py

@@ -2,18 +2,17 @@
 import os
 import re
 import sys
-
 from argparse import ArgumentParser, FileType
 from functools import partial
 from typing import List
 
 from mako.template import Template
 
 from tested.configs import Bundle, DodonaConfig
+from tested.languages import get_language, language_exists
 from tested.languages.description_generator import TYPE_ARG, TYPE_CONFIG_NAME
 from tested.testsuite import Suite
 from tested.utils import smart_close
-from tested.languages import get_language, language_exists
 
 open_brackets = ("(", "[", "{")
 close_brackets = {")": "(", "]": "[", "}": "{"}

tested/dodona.py

@@ -12,7 +12,7 @@
 import dataclasses
 import json
 from enum import Enum
-from typing import Optional, Union, Literal, IO, Type
+from typing import IO, Literal, Optional, Type, Union
 
 from pydantic import BaseModel
 from pydantic.dataclasses import dataclass

tested/dsl/__init__.py

@@ -1,2 +1,2 @@
-from .translate_parser import parse_dsl, translate_to_test_suite
-from .ast_translator import parse_string
+from tested.dsl.ast_translator import parse_string
+from tested.dsl.translate_parser import parse_dsl, translate_to_test_suite

tested/dsl/__main__.py

@@ -1,6 +1,7 @@
 from argparse import ArgumentParser, FileType
-from .translate_parser import translate_to_test_suite
-from ..utils import smart_close
+
+from tested.dsl.translate_parser import translate_to_test_suite
+from tested.utils import smart_close
 
 parser = ArgumentParser(description="Convert a DSL test suite to the JSON test suite.")
 parser.add_argument(

tested/dsl/ast_translator.py

@@ -26,35 +26,36 @@
 - Properties (ie. attributes)
 """
 
-from pydantic import ValidationError
-
 import ast
 import dataclasses
-from ..datatypes import (
+
+from pydantic import ValidationError
+
+from tested.datatypes import (
     AdvancedNothingTypes,
-    BasicNothingTypes,
-    AllTypes,
-    BasicSequenceTypes,
     AdvancedSequenceTypes,
+    AllTypes,
+    BasicNothingTypes,
     BasicObjectTypes,
+    BasicSequenceTypes,
 )
-from ..serialisation import (
-    Statement,
+from tested.serialisation import (
     Assignment,
     Expression,
     FunctionCall,
     FunctionType,
-    Value,
+    Identifier,
     NamedArgument,
-    serialize_from_python,
     NumberType,
-    SequenceType,
-    ObjectType,
     ObjectKeyValuePair,
+    ObjectType,
+    SequenceType,
+    Statement,
+    Value,
     VariableType,
-    Identifier,
+    serialize_from_python,
 )
-from ..utils import get_args
+from tested.utils import get_args
 
 
 class InvalidDslError(Exception):
@@ -112,7 +113,7 @@ def _convert_assignment(node: ast.Assign) -> Assignment:
 
     if not type_:
         raise InvalidDslError(
-            "Could deduce the type of the variable for assignment: add a type annotation."
+            f"Could not deduce the type of variable {variable.id}: add a type annotation."
         )
 
     return Assignment(variable=variable.id, expression=value, type=type_)

tested/dsl/translate_parser.py

@@ -1,47 +1,48 @@
+import json
+from logging import getLogger
+from pathlib import Path
+from typing import Callable, Dict, List, Optional, TextIO, TypeVar, Union
+
 import yaml
 from jsonschema import Draft7Validator
 from pydantic.json import pydantic_encoder
 
-import json
-from logging import getLogger
-from pathlib import Path
-from typing import Dict, List, Union, Callable, TextIO, TypeVar, Optional
-from .ast_translator import parse_string
-from ..datatypes import (
+from tested.datatypes import (
     BasicBooleanTypes,
     BasicNumericTypes,
     BasicObjectTypes,
     BasicSequenceTypes,
     BasicStringTypes,
 )
-from ..serialisation import (
-    Value,
-    NothingType,
-    StringType,
+from tested.dsl.ast_translator import parse_string
+from tested.serialisation import (
     BooleanType,
+    ExceptionValue,
+    NothingType,
     NumberType,
-    SequenceType,
-    ObjectType,
     ObjectKeyValuePair,
-    ExceptionValue,
+    ObjectType,
+    SequenceType,
+    StringType,
+    Value,
 )
-from ..testsuite import (
+from tested.testsuite import (
     Context,
+    EmptyChannel,
+    ExceptionOutputChannel,
+    ExitCodeOutputChannel,
     FileUrl,
     GenericTextEvaluator,
+    MainInput,
     Output,
     Suite,
-    MainInput,
     Tab,
     Testcase,
+    TextData,
     TextOutputChannel,
     ValueOutputChannel,
-    ExitCodeOutputChannel,
-    TextData,
-    EmptyChannel,
-    ExceptionOutputChannel,
 )
-from ..utils import recursive_dict_merge
+from tested.utils import recursive_dict_merge
 
 logger = getLogger(__name__)
 
@@ -268,7 +269,7 @@ def _convert_dsl(dsl_object: YamlObject) -> Suite:
     else:
         assert isinstance(dsl_object, dict)
         namespace = dsl_object.get("namespace")
-        config = _deepen_config_level(dsl_object.get("config"), {})
+        config = _deepen_config_level(dsl_object, {})
         tab_list = dsl_object["tabs"]
     tabs = _convert_dsl_list(tab_list, config, _convert_tab)