Permalink
Browse files

Fixup documentation regarding installs.

  • Loading branch information...
jmchilton committed Aug 27, 2016
1 parent e1f2284 commit ce44e8782400657b049be26250ac1f2b38a4fd7a
Showing with 17 additions and 22 deletions.
  1. +0 −2 .travis.yml
  2. +16 −19 README.rst
  3. +1 −1 docs/installation.rst
@@ -9,7 +9,6 @@ env:
- TOX_ENV=py27-quick
- TOX_ENV=py27
- TOX_ENV=py34
- TOX_ENV=py27-lint-imports
- TOX_ENV=py27-lint-docstrings

install:
@@ -21,7 +20,6 @@ install:
matrix:
allow_failures:
- env: TOX_ENV=py34
- env: TOX_ENV=py27-lint-imports
- env: TOX_ENV=py27-lint-docstrings

script: PLANEMO_ENABLE_POSTGRES_TESTS=1 PLANEMO_SKIP_CWLTOOL_TESTS=1 tox -e $TOX_ENV
@@ -33,35 +33,32 @@ develop Galaxy tools.
Obtaining Planemo
-----------------

The recommended approach for installing Planemo is to use Homebrew_ or
linuxbrew_. To install Planemo this way use the ``brew`` command as
follows.
For a traditional Python installation of Planemo, first set up a virtualenv
for ``planemo`` (this example creates a new one in ``.venv``) and then
install with ``pip``. Planemo requires pip 7.0 or newer.

::

$ brew tap galaxyproject/tap
$ brew install planemo
$ virtualenv .venv; . .venv/bin/activate
$ pip install "pip>=7" # Upgrade pip if needed.
$ pip install planemo


Planemo can alternatively be installed via Conda_:
Another approach for installing Planemo is to use Homebrew_ or
linuxbrew_. To install Planemo this way use the ``brew`` command as
follows.

::

$ conda config --add channels r
$ conda config --add channels bioconda
$ conda install planemo

For third option and a more traditional Python installation set up a virtualenv
for Planemo (this example creates a new one in ``.venv/``) and then
install it with ``pip``.

::
$ brew tap galaxyproject/tap
$ brew install planemo

$ virtualenv .venv; . .venv/bin/activate
$ pip install planemo
For information on updating Planemo, installing the latest development release,
or installing planemo via bioconda - checkout the `installation
<http://planemo.readthedocs.io/en/latest/installation.html>`__
documentation.

Planemo is also available as a `virtual appliance
<https://planemo.readthedocs.org/en/latest/appliance.html>`_ bundled
<https://planemo.readthedocs.io/en/latest/appliance.html>`_ bundled
with a preconfigured Galaxy server and set up for Galaxy tool development.
You can choose from open virtualization format (OVA_, .ova), Docker_,
or Vagrant_ appliances.
@@ -5,7 +5,7 @@ Installation
pip_
============

For a more traditional Python installation of Planemo set up a virtualenv
For a traditional Python installation of Planemo, first set up a virtualenv
for ``planemo`` (this example creates a new one in ``.venv``) and then
install with ``pip``. Planemo requires pip 7.0 or newer.

0 comments on commit ce44e87

Please sign in to comment.