From 1dca5ba14c35abf9440ee63e978bd0a37ba88b0d Mon Sep 17 00:00:00 2001 From: Tim Cera Date: Mon, 22 Apr 2024 22:43:53 -0400 Subject: [PATCH] (fix) replaced mando with cltoolbox mando used old import locations for Collections. --- HSP2tools/HSP2_CLI.py | 8 ++++---- README.rst | 2 +- pyproject.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HSP2tools/HSP2_CLI.py b/HSP2tools/HSP2_CLI.py index fb4bae6e..4d1d94e6 100644 --- a/HSP2tools/HSP2_CLI.py +++ b/HSP2tools/HSP2_CLI.py @@ -1,4 +1,4 @@ -import mando +import cltoolbox from HSP2.main import main as hsp2main from HSP2tools.readUCI import readUCI @@ -7,7 +7,7 @@ from HSP2IO.io import IOManager -@mando.command(doctype="numpy") +@cltoolbox.command() def run(hdfname, saveall=True, jupyterlab=False): """Run a HSPsquared model. @@ -26,7 +26,7 @@ def run(hdfname, saveall=True, jupyterlab=False): hsp2main(io_manager, saveall=saveall, jupyterlab=jupyterlab) -@mando.command(doctype="numpy") +@cltoolbox.command() def import_uci(ucifile, h5file): """Import UCI and WDM files into HDF5 file. @@ -57,7 +57,7 @@ def import_uci(ucifile, h5file): def main(): - mando.main() + cltoolbox.main() if __name__ == "__main__": diff --git a/README.rst b/README.rst index 08350efd..d2cdf9d0 100644 --- a/README.rst +++ b/README.rst @@ -119,7 +119,7 @@ Use the following `conda create`_ command in your terminal or console, Install the necessary and optional packages for HSP2 in the new environment: ```console - conda install -c conda-forge -n hsp2_310 mando numba pandas pytables + conda install -c conda-forge -n hsp2_310 cltoolbox numba pandas pytables conda install -c conda-forge -n hsp2_310 h5py jupyterlab matplotlib notebook ``` diff --git a/pyproject.toml b/pyproject.toml index ccb512b6..01326ec9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ name = "hsp2" dynamic = ["version", "readme"] description = "Hydrological Simulation Program - Python" dependencies = [ - "mando", + "cltoolbox", "numba", "pandas", "tables"