Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update python+package versions in install instructions #224

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Update python+package versions in install instructions #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
14 changes: 7 additions & 7 deletions docs/instructions/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.**
Loading