Merge pull request #299 from danforthcenter/add-pypi-conda-instructions

Add pypi and conda install instructions

.travis.yml

@@ -10,10 +10,10 @@ python:
 #  - python: '3.7'
 virtualenv:
   system_site_packages: false
-before_script:
-- export DISPLAY=:0
-- sh -e /etc/init.d/xvfb start
-- sleep 3
+#before_script:
+#- export DISPLAY=:0
+#- sh -e /etc/init.d/xvfb start
+#- sleep 3
 install:
 - |
   if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then

README.md

@@ -3,6 +3,8 @@
 [![Documentation Status](http://readthedocs.org/projects/plantcv/badge/?version=latest)](http://plantcv.readthedocs.io/en/latest/?badge=latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/danforthcenter/plantcv.svg)](https://hub.docker.com/r/danforthcenter/plantcv/)
 [![GitHub release](https://img.shields.io/github/release/danforthcenter/plantcv.svg)](https://github.com/danforthcenter/plantcv/releases)
+[![PyPI version](https://badge.fury.io/py/plantcv.svg)](https://badge.fury.io/py/plantcv)
+[![Anaconda-Server Badge](https://anaconda.org/bioconda/plantcv/badges/version.svg)](https://anaconda.org/bioconda/plantcv)
 [![license](https://img.shields.io/github/license/danforthcenter/plantcv.svg)](https://github.com/danforthcenter/plantcv/blob/master/LICENSE)
 
 # PlantCV: Plant phenotyping using computer vision

docs/installation.md

@@ -33,7 +33,44 @@ PlantCV has been tested on the following systems:
 - Jupyter
 - SQLite
 
-### Conda-based installation procedure
+### Install via a package manager
+
+Stable releases of PlantCV are available through both the Python Package Index (PyPI) and `conda` through the 
+[Bioconda channel](https://bioconda.github.io/). We plan on releasing new versions of PlantCV into both platforms on
+at least a monthly basis.
+
+#### PyPI
+
+To install from PyPI run the following in any type of virtual environment, as an administrator, or add the `--user` 
+flag if needed.
+
+```bash
+pip install plantcv
+```
+
+#### Conda
+
+To install using `conda` first install [Anaconda](https://www.anaconda.com/download/) or 
+[Miniconda](https://conda.io/miniconda.html) if you have not already. If needed, add the following channels to your
+`conda` configuration.
+
+```bash
+conda config --add channels defaults
+conda config --add channels bioconda
+conda config --add channels conda-forge
+```
+
+Then create an environment and install PlantCV.
+
+```bash
+conda create -n plantcv plantcv
+```
+
+### Manual installs
+
+You can build PlantCV from the source on GitHub if you are a developer or want the absolute latest version possible.
+
+#### Conda-based installation procedure
 
 **Platforms**: Linux, macOS, Windows
 
@@ -94,7 +131,7 @@ optional `sqlite3` package.
 conda install -c blaze sqlite3
 ```
 
-### Using PlantCV containers
+#### Using PlantCV containers
 
 **Platforms**: Linux, macOS, Windows
 
@@ -131,7 +168,7 @@ docker run -v /home/user:/data danforthcenter/plantcv \
 python /data/test-script.py -i /data/test-image.png -o /data -r /data/plantcv-results.txt
 ```
 
-### Script-based installation
+#### Script-based installation
 
 **Platforms**: Ubuntu, macOS
 

environments/environment27.yml

@@ -3,7 +3,7 @@ name: test-environment
 dependencies:
   - python=2.7
   - matplotlib>=1.5
-  - numpy>=1.11
+  - numpy>=1.11,<1.16
   - pandas
   - python-dateutil
   - scipy