Skip to content

Commit

Permalink
Replace current pip moi with moi-dev version
Browse files Browse the repository at this point in the history
  • Loading branch information
HannesHolste committed Jun 16, 2016
1 parent eb16b4e commit e4ee893
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 7 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ If you receive an error message about conda being unable to find one of the spec

### Brief introduction to managing conda environments

Though these instructions use the newly created `qiita` conda environment, the concepts apply to managing conda environments in general.
Though these instructions use the newly created `qiita` conda environment, the concepts apply to managing conda environments in general.

Activate your newly created virtual environment for qiita whenever you want to run or develop for it:

Expand Down Expand Up @@ -64,7 +64,7 @@ Install the non-python dependencies
There are several options to install these dependencies depending on your needs:

- **We suggest installing the exact versions in these instructions by following the instructions of the provided links and making them globally available in your machine. However, this might interfere with other apps that might require different versions.** 
- Alternatively, you could install them via conda. However, the conda repository may not have the exact versions of these dependencies that you want.
- Alternatively, you could install them via conda. However, the conda repository may not have the exact versions of these dependencies that you want.
- You could setup a full development environment with [Vagrant](https://www.vagrantup.com/), and continue using conda under it to primarily manage python dependencies. Note that we don't cover Vagrant in these instructions.

### PostgreSQL installation on Mac OS X
Expand Down Expand Up @@ -104,6 +104,11 @@ cd qiita
source activate qiita
```

Install the development version of moi:
```bash
pip install https://github.com/biocore/mustached-octo-ironman/archive/master.zip --no-deps
```

Install Qiita (this occurs through setuptools' `setup.py` file in the qiita directory):

```bash
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
'ipython[all] >= 2.4.1, < 2.5', 'pyparsing',
'h5py >= 2.3.1', 'biom-format', 'natsort', 'networkx',
'scikit-bio >= 0.2.3, < 0.3.0', 'wtforms == 2.0.1',
'qiime >= 1.9.0, < 1.10.0', 'moi',
'qiime >= 1.9.0, < 1.10.0',
'sphinx-bootstrap-theme', 'Sphinx >= 1.2.2',
'gitpython'],
classifiers=classifiers
Expand Down

0 comments on commit e4ee893

Please sign in to comment.