Skip to content

Commit ce44e87

Browse files
committed
Fixup documentation regarding installs.
1 parent e1f2284 commit ce44e87

File tree

3 files changed

+17
-22
lines changed

3 files changed

+17
-22
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ env:
99
- TOX_ENV=py27-quick
1010
- TOX_ENV=py27
1111
- TOX_ENV=py34
12-
- TOX_ENV=py27-lint-imports
1312
- TOX_ENV=py27-lint-docstrings
1413

1514
install:
@@ -21,7 +20,6 @@ install:
2120
matrix:
2221
allow_failures:
2322
- env: TOX_ENV=py34
24-
- env: TOX_ENV=py27-lint-imports
2523
- env: TOX_ENV=py27-lint-docstrings
2624

2725
script: PLANEMO_ENABLE_POSTGRES_TESTS=1 PLANEMO_SKIP_CWLTOOL_TESTS=1 tox -e $TOX_ENV

README.rst

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,35 +33,32 @@ develop Galaxy tools.
3333
Obtaining Planemo
3434
-----------------
3535

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

4040
::
4141

42-
$ brew tap galaxyproject/tap
43-
$ brew install planemo
42+
$ virtualenv .venv; . .venv/bin/activate
43+
$ pip install "pip>=7" # Upgrade pip if needed.
44+
$ pip install planemo
4445

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

4850
::
4951

50-
$ conda config --add channels r
51-
$ conda config --add channels bioconda
52-
$ conda install planemo
53-
54-
For third option and a more traditional Python installation set up a virtualenv
55-
for Planemo (this example creates a new one in ``.venv/``) and then
56-
install it with ``pip``.
57-
58-
::
52+
$ brew tap galaxyproject/tap
53+
$ brew install planemo
5954

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

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

docs/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Installation
55
pip_
66
============
77

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

0 commit comments

Comments
 (0)