Skip to content

Commit

Permalink
Add conda-forge instructions for mac (#134)
Browse files Browse the repository at this point in the history
* update docs with conda forge

* tweak

* code review feedback

* link to issue; use admonition
  • Loading branch information
ejm714 authored Jan 22, 2024
1 parent c6977dc commit 140686c
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 5 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CyFi: Cyanobacteria Finder
==============================

[![PyPI](https://img.shields.io/pypi/v/cyfi.svg)](https://pypi.org/project/cyfi/)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/cyfi.svg)](https://anaconda.org/conda-forge/cyfi)
[![tests](https://github.com/drivendataorg/cyfi/workflows/tests/badge.svg?branch=main)](https://github.com/drivendataorg/cyfi/actions?query=workflow%3Atests+branch%3Amain)
[![codecov](https://codecov.io/gh/drivendataorg/cyfi/branch/main/graph/badge.svg)](https://codecov.io/gh/drivendataorg/cyfi)

Expand All @@ -13,12 +14,21 @@ Read more at [cyfi.drivendata.org](https://cyfi.drivendata.org)

### Install

> [!NOTE]
> There is a known [issue](https://github.com/drivendataorg/cyfi/issues/114) with the pip installation on M1 Macs due to LightGBM. If you're on a Mac, we recommend installing CyFi with conda, shown in the second option below.
Install CyFi with pip:

```
pip install cyfi
```

Alternatively, CyFi can be installed with conda:

```
conda install -c conda-forge cyfi
```

For detailed instructions for those installing python for the first time, see the [Installation](https://cyfi.drivendata.org/installation/) page.

### Generate batch predictions
Expand Down
10 changes: 10 additions & 0 deletions docs/docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,22 @@

### Install

!!! note ""

Note: There is a known [issue](https://github.com/drivendataorg/cyfi/issues/114) with the pip installation on M1 Macs due to LightGBM. If you're on a Mac, we recommend installing CyFi with conda, shown in the second option below.

Install CyFi with pip:

```
pip install cyfi
```

Alternatively, CyFi can be installed with conda:

```
conda install -c conda-forge cyfi
```

For detailed instructions for those installing python for the first time, see the [Installation](installation.md) docs.

### Generate batch predictions
Expand Down
12 changes: 7 additions & 5 deletions docs/docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Once the Miniconda installation has finished,
```
$ pip show cyfi
Name: cyfi
Version: 0.1.0
Version: 1.1.2
Summary: CyFi is a Python package to estimate cyanobacteria density in small, inland water bodies using Sentinel-2 satellite imagery.
```

Expand All @@ -64,14 +64,16 @@ Once the Miniconda installation has finished,

1. Open the terminal by typing ⌘+space (to open spotlight search) and then typing "Terminal". Hit enter.

2. Type `pip install cyfi` and hit enter
2. Type `conda install -c conda-forge cyfi` and hit enter.

3. To check that CyFi has been installed, run `pip show cyfi`
3. When prompted with "Proceed ([y]/n)?", hit enter again.

4. To check that CyFi has been installed, run `pip show cyfi`

```
$ pip show cyfi
Name: cyfi
Version: 0.1.0
Version: 1.1.2
Summary: CyFi is a Python package to estimate cyanobacteria density in small, inland water bodies using Sentinel-2 satellite imagery.
```

Expand Down Expand Up @@ -102,6 +104,6 @@ Summary: CyFi is a Python package to estimate cyanobacteria density in small, in
```
$ pip show cyfi
Name: cyfi
Version: 0.1.0
Version: 1.1.2
Summary: CyFi is a Python package to estimate cyanobacteria density in small, inland water bodies using Sentinel-2 satellite imagery.
```
1 change: 1 addition & 0 deletions docs/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ nav:
- Changelog: "changelog.md"

markdown_extensions:
- admonition
- toc:
permalink: True
toc_depth: 3
Expand Down

0 comments on commit 140686c

Please sign in to comment.