Skip to content

Commit

Permalink
Update getting started info for Conda users.
Browse files Browse the repository at this point in the history
  • Loading branch information
ahaerpfer committed Apr 13, 2015
1 parent 04bbc64 commit f3a847e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2015-04-13 Andreas Härpfer <ahaerpfer@gmail.com>

* doc/dev/getting-started.rst: clarify Conda usage

2015-04-13 Daniel Standage <daniel.standage@gmail.com>

* scripts/normalize-by-median.py: Added support to the diginorm script for
Expand Down
21 changes: 15 additions & 6 deletions doc/dev/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,10 @@ One-time Preparation
tar xzf virtualenv*
cd virtualenv-*; python2.7 virtualenv.py ../env; cd ..
`Conda <https://github.com/conda/conda>`__ users on any platform can install
virtualenv this way::
`Conda <https://github.com/conda/conda>`__ users on any platform
should instead create a separate Conda environment::

conda install pip
hash -r
pip install virtualenv
python2.7 -m virtualenv env
conda create -n khmer anaconda

#. Activate the virtualenv and install a few packages::

Expand All @@ -113,13 +110,25 @@ One-time Preparation
<https://nose.readthedocs.org/en/latest/>`__, packages we use for
building the documentation and running the tests.)

In Conda to activate the previously created environment and install
dependencies::

source activate khmer
cd khmer
make install-dependencies


Building khmer and running the tests
------------------------------------

#. Activate (or re-activate) the virtualenv::

source ../env/bin/activate

... or for Conda users::

source activate khmer

You can run this many times without any ill effects.

(This puts you in the development environment.)
Expand Down

0 comments on commit f3a847e

Please sign in to comment.