From 6925ea046704edbf5ea8e5ecbd10641d69e0ce6c Mon Sep 17 00:00:00 2001 From: mjreno Date: Mon, 17 Nov 2025 11:26:46 -0500 Subject: [PATCH 1/5] install extras test --- pyproject.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 6be2f721..066f109b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,6 +88,12 @@ include = ["flopy4", "flopy4.*"] [tool.setuptools.package-data] "flopy4.dfns" = ["dfns/*.dfn"] "flopy4.toml" = ["dfns/toml/*.toml"] +"flopy4.extras" = [ + "flopy4/mf6/codec/reader/grammar/*.lark", + "flopy4/mf6/codec/reader/grammar/generated/*.lark", + "flopy4/mf6/codec/reader/grammar/templates/*.jinja", + "flopy4/mf6/codec/writer/templates/*.jinja", +] [tool.ruff] line-length = 100 From 0295d7b3bfcd06d9bb11a24b630bae13a3b9b834 Mon Sep 17 00:00:00 2001 From: mjreno Date: Mon, 17 Nov 2025 11:39:31 -0500 Subject: [PATCH 2/5] install test 2 --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 066f109b..4a20a78c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,9 +88,11 @@ include = ["flopy4", "flopy4.*"] [tool.setuptools.package-data] "flopy4.dfns" = ["dfns/*.dfn"] "flopy4.toml" = ["dfns/toml/*.toml"] -"flopy4.extras" = [ +"flopy4.lark" = [ "flopy4/mf6/codec/reader/grammar/*.lark", "flopy4/mf6/codec/reader/grammar/generated/*.lark", +] +"flopy4.jinja2" = [ "flopy4/mf6/codec/reader/grammar/templates/*.jinja", "flopy4/mf6/codec/writer/templates/*.jinja", ] From 2bbfa64ee0a48b303a5adfb21dcf2fb5071a495b Mon Sep 17 00:00:00 2001 From: mjreno Date: Mon, 17 Nov 2025 11:47:30 -0500 Subject: [PATCH 3/5] install test 3 --- pyproject.toml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4a20a78c..678c6919 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,13 +88,11 @@ include = ["flopy4", "flopy4.*"] [tool.setuptools.package-data] "flopy4.dfns" = ["dfns/*.dfn"] "flopy4.toml" = ["dfns/toml/*.toml"] -"flopy4.lark" = [ - "flopy4/mf6/codec/reader/grammar/*.lark", - "flopy4/mf6/codec/reader/grammar/generated/*.lark", -] -"flopy4.jinja2" = [ - "flopy4/mf6/codec/reader/grammar/templates/*.jinja", - "flopy4/mf6/codec/writer/templates/*.jinja", +"flopy4" = [ + "mf6/codec/reader/grammar/*.lark", + "mf6/codec/reader/grammar/generated/*.lark", + "mf6/codec/reader/grammar/templates/*.jinja", + "mf6/codec/writer/templates/*.jinja", ] [tool.ruff] From bd36d193498035c1b1004d52f5256d66d49cf8c7 Mon Sep 17 00:00:00 2001 From: mjreno Date: Mon, 17 Nov 2025 11:56:14 -0500 Subject: [PATCH 4/5] update lockfile --- pixi.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.lock b/pixi.lock index b59d11c2..c31a80df 100644 --- a/pixi.lock +++ b/pixi.lock @@ -5318,7 +5318,7 @@ packages: - pypi: ./ name: flopy4 version: 0.0.1.dev0 - sha256: 32b41595aa9f3fae738e08c28b3d43c8e4c0a1f1905e2a7cee76feff0872de71 + sha256: 5f2a5c53d36db187a68751cef0f5e4ed1fc21eb8ce64b53e79881df5ff033ae7 requires_dist: - modflow-devtools[dfn] @ git+https://github.com/MODFLOW-ORG/modflow-devtools.git@dfn - xattree @ git+https://github.com/wpbonelli/xattree.git From 0f41b4c85dc35feb57ae6d82a9cf6c3e51d4a029 Mon Sep 17 00:00:00 2001 From: mjreno Date: Mon, 17 Nov 2025 13:47:29 -0500 Subject: [PATCH 5/5] make path search generic under codec --- pixi.lock | 2 +- pyproject.toml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pixi.lock b/pixi.lock index c31a80df..c3efa9aa 100644 --- a/pixi.lock +++ b/pixi.lock @@ -5318,7 +5318,7 @@ packages: - pypi: ./ name: flopy4 version: 0.0.1.dev0 - sha256: 5f2a5c53d36db187a68751cef0f5e4ed1fc21eb8ce64b53e79881df5ff033ae7 + sha256: e2bd4bc603e77ab202708920decb6d1ba9ac82b48b6f8f9229fed27374e1ed3f requires_dist: - modflow-devtools[dfn] @ git+https://github.com/MODFLOW-ORG/modflow-devtools.git@dfn - xattree @ git+https://github.com/wpbonelli/xattree.git diff --git a/pyproject.toml b/pyproject.toml index 678c6919..c214ce0e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,10 +89,8 @@ include = ["flopy4", "flopy4.*"] "flopy4.dfns" = ["dfns/*.dfn"] "flopy4.toml" = ["dfns/toml/*.toml"] "flopy4" = [ - "mf6/codec/reader/grammar/*.lark", - "mf6/codec/reader/grammar/generated/*.lark", - "mf6/codec/reader/grammar/templates/*.jinja", - "mf6/codec/writer/templates/*.jinja", + "mf6/codec/**/*.lark", + "mf6/codec/**/*.jinja", ] [tool.ruff]