Merge pull request #1 from Fluorescence-Tools/development

Development
Fluorescence-Tools · Feb 17, 2024 · d5adf85 · d5adf85
2 parents 3ac6d38 + 4921018
commit d5adf85
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git 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
 ```
 
 

diff --git 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

diff --git a/tools/install_macos_sdk.sh b/tools/install_macos_sdk.sh