Move grammar.lark to module base

ajcr · Nov 2, 2023 · 98db31e · 98db31e
1 parent 206591e
commit 98db31e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+include grammar.lark
diff --git a/src/urn/grammar.lark → grammar.lark b/src/urn/grammar.lark → grammar.lark
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,4 +36,9 @@ dev = ["pytest"]
 Homepage = "https://github.com/ajcr/urn"
 
 [project.scripts]
-urn = "urn.cli:main"
+urn = "urn.cli:main"
+
+[tool.pytest.ini_options]
+pythonpath = [
+  "."
+]
diff --git a/src/urn/cli.py b/src/urn/cli.py
@@ -5,7 +5,7 @@
 
 from urn import __version__
 
-DESCRIPTION = "Draw odds calculator."
+DESCRIPTION = "Multivariate hypergeometric calculator."
 
 
 def parse_args() -> argparse.Namespace:
@@ -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=__file__)
+    command_parser = lark.Lark.open("grammar.lark", rel_to=__package__)
 
     if args.command or args.filename:
 

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