From 9fa11ae27d435854be672a5389a68a516837bce8 Mon Sep 17 00:00:00 2001 From: Thomas-Otavio Peulen Date: Sat, 17 Feb 2024 13:36:21 +0100 Subject: [PATCH 1/3] remove tools submodule --- tools/install_macos_sdk.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools/install_macos_sdk.sh diff --git a/tools/install_macos_sdk.sh b/tools/install_macos_sdk.sh old mode 100644 new mode 100755 From 9d463a5eeca47de41da96f31639ab96f36fdbaf4 Mon Sep 17 00:00:00 2001 From: Thomas-Otavio Peulen Date: Sat, 17 Feb 2024 14:23:16 +0100 Subject: [PATCH 2/3] Add missing package --- conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 55508b4..2519d4f 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -35,6 +35,7 @@ requirements: - python {{ python }} - typing_extensions <=4.5 - numpy + - numba - pandas - pyyaml >=5.0.0 - qtpy From 4921018da3b5b00c322192e9c8848ed129858768 Mon Sep 17 00:00:00 2001 From: Thomas-Otavio Peulen Date: Sat, 17 Feb 2024 14:53:46 +0100 Subject: [PATCH 3/3] Update README.md --- README.md | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 94a4ef1..fab1ddf 100644 --- a/README.md +++ b/README.md @@ -33,25 +33,19 @@ clsmview ``` ### Conda -``clsmview`` depends on common python packages such as ``numpy``, ``opencv``, and ``pandas``. -Additionally, ``clsmviewer`` depends on ``tttrlib``, and ``imp``. Thus, -to install ``clsmviewr`` make sure that conda channels that provide packages for the necessary -dependencies are listed in the ``.condarc`` file - -```yaml -channels: - - salilab - - tpeulen - - tpeulen/label/nightly - - conda-forge - - defaults +``clsmview`` can be installed using conda (best in a separate environment) + +```bash +conda create clsmview +conda activate clsmview +mamba install clsmview -c tpeeulen ``` -To avoid potential conflicts ``clsmview`` can be installed in a separate environment. +To run `clsmview` activate its environment and use the `clsmview` command -```commandline -conda create -n test -conda install clsmview +```bash +conda activate clsmview +clsmview ```