Skip to content

Commit

Permalink
full typing per MyPy, fixed bugs revealed by MyPy, use pythonic names
Browse files Browse the repository at this point in the history
  • Loading branch information
jcschaff committed Aug 15, 2024
1 parent ef6429f commit 5ecfb3b
Show file tree
Hide file tree
Showing 33 changed files with 25,053 additions and 568 deletions.
180 changes: 108 additions & 72 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.9,<4.0"
python = ">=3.10,<4.0"
numexpr = "^2.10.0"
zarr = "^2.17.2"
h5py = "^3.11.0"
Expand All @@ -20,6 +20,8 @@ numpy = "^1.26.4"
orjson = "^3.10.3"
vtk = "^9.3.1"
pyvcell-fvsolver = "^0.0.4"
typer = "^0.12.3"
h5py-stubs = "^0.1.1"

[tool.poetry.group.dev.dependencies]
pytest = "^7.2.0"
Expand Down
7 changes: 4 additions & 3 deletions pyvcell/simdata/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ def n5_to_zarr(
sim_data_dir: Path = typer.Argument(..., help="path to vcell dataset directory"),
sim_id: int = typer.Argument(..., help="simulation id (e.g. 946368938)"),
job_id: int = typer.Argument(..., help="job id (e.g. 0"),
zarr_path: Path = typer.Argument(..., help="path to zarr dataset to write to")):
zarr_path: Path = typer.Argument(..., help="path to zarr dataset to write to")
) -> None:
pde_dataset = PdeDataSet(base_dir=sim_data_dir, log_filename=f"SimID_{sim_id}_{job_id}_.log")
pde_dataset.read()
data_functions = DataFunctions(function_file=sim_data_dir / f"SimID_{sim_id}_{job_id}_.functions")
Expand All @@ -25,9 +26,9 @@ def n5_to_zarr(
write_zarr(pde_dataset=pde_dataset, data_functions=data_functions, mesh=mesh, zarr_dir=zarr_path)


def main():
def main() -> None:
app()


if __name__ == "__main__":
main()
main()
Loading

0 comments on commit 5ecfb3b

Please sign in to comment.