Merge pull request #5 from ajcr/move_grammar

Move grammar.lark back under src/
ajcr · Nov 2, 2023 · f69b1bd · f69b1bd
2 parents e4e6a09 + 1fb234e
commit f69b1bd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include grammar.lark
+include src/urn/grammar.lark
diff --git a/pyproject.toml b/pyproject.toml
@@ -41,5 +41,5 @@ urn = "urn.cli:main"
 
 [tool.pytest.ini_options]
 pythonpath = [
-  "."
+    "src"
 ]
diff --git a/src/urn/cli.py b/src/urn/cli.py
@@ -30,7 +30,7 @@ def main() -> None:
     from urn.shell import run_shell
     from urn.evaluation import process_query
 
-    command_parser = lark.Lark.open("grammar.lark", rel_to=__package__)
+    command_parser = lark.Lark.open("grammar.lark", rel_to=__file__)
 
     if args.command or args.filename:
 

diff --git a/grammar.lark → src/urn/grammar.lark b/grammar.lark → src/urn/grammar.lark
diff --git a/tests/test_parsing.py b/tests/test_parsing.py
@@ -8,8 +8,9 @@
 
 
 @pytest.fixture(scope="session")
-def parser():
-    return lark.Lark.open("grammar.lark")
+def parser(request):
+    rel_to = request.config.rootdir / "src" / "urn" / "grammar.lark"
+    return lark.Lark.open("grammar.lark", rel_to=rel_to)
 
 
 @pytest.mark.parametrize(