Remove toplevel __init__.py (#1)

.travis.yml

@@ -17,5 +17,5 @@ script:
   - >-
     echo -e "${ANSI_GREEN}Running Tests...${ANSI_RESET}"
     && echo -en 'travis_fold:start:tests\\r'
-  - pytest
+  - pytest tests
   - echo -en 'travis_fold:end:tests\\r'

docsource/contrib.md

@@ -17,7 +17,7 @@ To suggest a change to this repository, [submit a pull request](https://github.i
 
 The test suite can be executed with the following command in the top-level folder:
 ```
-pytest
+pytest tests
 ```
 
 Also, please make sure that your changes pass static checks such as code styles by executing the following command:

tests/test_array.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 array_data = {"description": "Array", "array": ["1", "2", "3", "4"]}
 

tests/test_code.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 python_data = {
     "description": "Hello world showing call out to python code",

tests/test_cond.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 cond_data = {
     "description": "Arithmetic Expressions",

tests/test_defs.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 defs_data = {
     "description": "Hello world with variable use",

tests/test_errors.py

@@ -2,13 +2,9 @@
 
 from pydantic import ValidationError
 
-from pdl.pdl.pdl_ast import Program, empty_block_location  # pyright: ignore
-from pdl.pdl.pdl_interpreter import (  # pyright: ignore
-    InterpreterState,
-    empty_scope,
-    process_prog,
-)
-from pdl.pdl.pdl_schema_error_analyzer import analyze_errors  # pyright: ignore
+from pdl.pdl_ast import Program, empty_block_location
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
+from pdl.pdl_schema_error_analyzer import analyze_errors
 
 
 def error(raw_data, assertion):

tests/test_examples.py

@@ -3,7 +3,7 @@
 import pydantic
 import yaml
 
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
+from pdl.pdl_ast import Program
 
 EXPECTED_INVALID = [
     pathlib.Path("tests") / "data" / "line" / "hello.pdl",

tests/test_expr.py

@@ -1,8 +1,8 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import (  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import (
     InterpreterState,
     contains_error,
+    empty_scope,
     process_prog,
 )
 

tests/test_fallback.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 direct_fallback_data = {"model": "raise an error", "fallback": "The error was caught"}
 

tests/test_for.py

@@ -1,8 +1,8 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import (  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import (
     InterpreterState,
     contains_error,
+    empty_scope,
     process_prog,
 )
 

tests/test_function.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 hello_def = {
     "def": "hello",

tests/test_hello.py

@@ -1,8 +1,8 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import (  # pyright: ignore
+from pdl.pdl_ast import Program, RepeatBlock
+from pdl.pdl_interpreter import (
     InterpreterState,
     contains_error,
+    empty_scope,
     process_prog,
 )
 
@@ -121,8 +121,9 @@ def test_repeat_error():
     _, _, _, trace = process_prog(state, empty_scope, data)
     errors = 0
     print(trace)
-    for document in trace.trace:
-        if contains_error(document):
-            errors += 1
+    if trace is not None and isinstance(trace, RepeatBlock):
+        for document in trace.trace:
+            if contains_error(document):
+                errors += 1
 
     assert errors == 1

tests/test_include.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 include_data = {
     "description": "Include test",

tests/test_input.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 input_data = {
     "description": "Input block example",

tests/test_line_table.py

@@ -1,4 +1,4 @@
-from pdl.pdl.pdl_interpreter import generate  # pyright: ignore
+from pdl.pdl_interpreter import generate
 
 
 def do_test(t, capsys):

tests/test_messages.py

@@ -1,8 +1,7 @@
 import yaml
 
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 
 def parse_prog_str(prog_str):

tests/test_model.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 model_data = {
     "description": "Hello world with a variable to call into a model",

tests/test_parse.py

@@ -1,6 +1,5 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 regex_data = {
     "description": "Parsing using regex",

tests/test_parser.py

@@ -1,8 +1,8 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import (  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import (
     InterpreterState,
     contains_error,
+    empty_scope,
     process_prog,
 )
 

tests/test_role.py

@@ -1,8 +1,7 @@
 import yaml
 
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import InterpreterState, process_prog  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import InterpreterState, empty_scope, process_prog
 
 
 def parse_prog_str(prog_str):

tests/test_schema.py

@@ -2,7 +2,7 @@
 
 from pydantic.json_schema import models_json_schema
 
-from pdl.pdl.pdl_ast import PdlBlock, PdlBlocks, Program  # pyright: ignore
+from pdl.pdl_ast import PdlBlock, PdlBlocks, Program
 
 
 def test_saved_schema():

tests/test_type_checking.py

@@ -1,13 +1,13 @@
 import yaml
 
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import (  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import (
     InterpreterState,
     contains_error,
+    empty_scope,
     process_prog,
 )
-from pdl.pdl.pdl_schema_utils import pdltype_to_jsonschema  # pyright: ignore
+from pdl.pdl_schema_utils import pdltype_to_jsonschema
 
 _PDLTYPE_TO_JSONSCHEMA_TESTS = [
     {

tests/test_var.py

@@ -1,8 +1,8 @@
-from pdl.pdl.pdl_ast import Program  # pyright: ignore
-from pdl.pdl.pdl_interpreter import empty_scope  # pyright: ignore
-from pdl.pdl.pdl_interpreter import (  # pyright: ignore
+from pdl.pdl_ast import Program
+from pdl.pdl_interpreter import (
     InterpreterState,
     contains_error,
+    empty_scope,
     process_prog,
 )