From 6870b42da40d27dfc6a713ae20d12ccd4ff4961a Mon Sep 17 00:00:00 2001 From: Jamie Morton Date: Fri, 26 Aug 2016 12:06:17 -0700 Subject: [PATCH] Adding manifest for pip removing typo Adding conda install instructions back Adding pyqt requirement --- MANIFEST.in | 11 +++++++++++ README.md | 6 ++++++ gneiss/_formula.py | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..ce49a34 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,11 @@ +include .coveragerc +include CHANGELOG.md +include COPYING.txt +include Makefile +include README.md + +graft gneiss + +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git diff --git a/README.md b/README.md index 17a41e0..780b468 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,15 @@ conda create -n gneiss_env python=3 gneiss then can be installed as follows ``` source activate gneiss_env +conda install pyqt pip install gneiss ``` +gneiss can also be installed through conda +``` +conda install -c biocore gneiss +``` + To run through the tutorials, you'll need a few more packages, namely `seaborn`, `biom-format` and `h5py`. These packages can be installed with conda as follows ``` diff --git a/gneiss/_formula.py b/gneiss/_formula.py index 1e8f7d6..8136a44 100644 --- a/gneiss/_formula.py +++ b/gneiss/_formula.py @@ -1,4 +1,4 @@ -`# ---------------------------------------------------------------------------- +# ---------------------------------------------------------------------------- # Copyright (c) 2016--, gneiss development team. # # Distributed under the terms of the GPLv3 License.