From f328b7474f13fa78afde0d87801736f031b25ec3 Mon Sep 17 00:00:00 2001 From: Jeremy Muhlich Date: Mon, 2 Sep 2024 01:48:04 -0400 Subject: [PATCH] Update python+package versions in install instructions --- README.md | 15 +++++++-------- docs/instructions/installation.md | 14 +++++++------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index ab9a241a..6cd5c5df 100644 --- a/README.md +++ b/README.md @@ -89,13 +89,13 @@ pip install ashlar ### Using a conda environment If you don't already have [miniconda](https://docs.conda.io/en/latest/miniconda.html) -or [Anaconda](https://www.anaconda.com/products/individual), download the python -3.x version and install. Then, run the following commands from a terminal (Linux/Mac) -or command prompt (Windows): +or [Anaconda](https://www.anaconda.com/products/individual), download Anaconda and +install. Then, run the following commands from a terminal (Linux/Mac) or Anaconda +command prompt (Windows): -Create a named conda environment with python 3.10: +Create a named conda environment with python 3.12: ```bash -conda create -y -n ashlar python=3.10 +conda create -y -n ashlar python=3.12 ``` Activate the conda environment: @@ -105,11 +105,10 @@ conda activate ashlar In the activated environment, install dependencies and ashlar itself: ```bash -conda install -y -c conda-forge numpy scipy matplotlib networkx scikit-image=0.19 scikit-learn "tifffile>=2023.3.15" zarr pyjnius blessed +conda install -y -c conda-forge numpy scipy matplotlib networkx scikit-image scikit-learn tifffile zarr pyjnius blessed pip install ashlar ``` ### Docker image -The docker image of ashlar is on DockerHub at `labsyspharm/ashlar` which should be -suitable for many use cases. +The docker image of ashlar is on DockerHub at [labsyspharm/ashlar](https://hub.docker.com/r/labsyspharm/ashlar) and should be suitable for many use cases. diff --git a/docs/instructions/installation.md b/docs/instructions/installation.md index 84be975a..676da792 100644 --- a/docs/instructions/installation.md +++ b/docs/instructions/installation.md @@ -18,13 +18,13 @@ pip install ashlar ### Using a conda environment If you don't already have [miniconda](https://docs.conda.io/en/latest/miniconda.html) -or [Anaconda](https://www.anaconda.com/products/individual), download the python -3.x version and install. Then, run the following commands from a terminal (Linux/Mac) -or command prompt (Windows): +or [Anaconda](https://www.anaconda.com/products/individual), download Anaconda and +install. Then, run the following commands from a terminal (Linux/Mac) or Anaconda +command prompt (Windows): -Create a named conda environment with python 3.10: +Create a named conda environment with python 3.12: ```bash -conda create -y -n ashlar python=3.10 +conda create -y -n ashlar python=3.12 ``` Activate the conda environment: @@ -34,11 +34,11 @@ conda activate ashlar In the activated environment, install dependencies and ashlar itself: ```bash -conda install -y -c conda-forge numpy scipy matplotlib networkx scikit-image=0.16.2 scikit-learn pyjnius +conda install -y -c conda-forge numpy scipy matplotlib networkx scikit-image scikit-learn tifffile zarr pyjnius blessed pip install ashlar ``` ### Docker image -The docker image of ashlar is on [DockerHub](https://hub.docker.com/r/labsyspharm/ashlar) and should be suitable for many use cases. +The docker image of ashlar is on DockerHub at [labsyspharm/ashlar](https://hub.docker.com/r/labsyspharm/ashlar) and should be suitable for many use cases. **Return to the [quick start guide](./) to learn more about how to use ASHLAR.**