This commit is contained in:
Reid 'arrdem' McKenzie 2021-08-21 17:25:19 -06:00
parent f69b243c4f
commit 15c7417516
2 changed files with 13 additions and 24 deletions

View file

@ -1,11 +1,19 @@
py_project( py_project(
name = "lilith", name = "lib",
main = "src/python/lilith/__main__.py",
lib_deps = [ lib_deps = [
py_requirement("lark"), py_requirement("lark"),
py_requirement("prompt_toolkit"),
], ],
test_deps = [ test_deps = [
py_requirement("hypothesis"), py_requirement("hypothesis"),
], ],
) )
zapp_binary(
name = "lilith",
main = "src/python/lilith/__main__.py",
deps = [
":lib",
py_requirement("lark"), # FIXME: Absolutely a zapp bug
py_requirement("prompt_toolkit"),
],
)

View file

@ -146,7 +146,6 @@ py_resources = rule(
) )
def py_project(name=None, def py_project(name=None,
main=None,
lib_srcs=None, lib_srcs=None,
lib_deps=None, lib_deps=None,
lib_data=None, lib_data=None,
@ -185,10 +184,8 @@ def py_project(name=None,
"**/*.pyc", "**/*.pyc",
]) ])
lib_name = name if not main else "lib"
py_library( py_library(
name=lib_name, name=name,
srcs=lib_srcs, srcs=lib_srcs,
deps=lib_deps, deps=lib_deps,
data=lib_data, data=lib_data,
@ -201,28 +198,12 @@ def py_project(name=None,
], ],
) )
if main:
py_binary(
name = name,
main = main,
imports=[
"src/python",
"src/resources",
],
deps=[
lib_name,
],
visibility = [
"//visibility:public",
],
)
for src in test_srcs: for src in test_srcs:
if "test_" in src: if "test_" in src:
py_pytest( py_pytest(
name=src.split("/")[-1], name=src.split("/")[-1],
srcs=[src] + [f for f in test_srcs if "test_" not in f], srcs=[src] + [f for f in test_srcs if "test_" not in f],
deps=[lib_name] + (test_deps or []), deps=[name] + (test_deps or []),
data=test_data, data=test_data,
imports=[ imports=[
"test/python", "test/python",