Skip to content

Commit

Permalink
Merge branch 'moa.0.11' of ssh.github.com:mfiers/Moa into moa.0.11
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Fiers committed Nov 29, 2012
2 parents 82743f4 + d6ca0e0 commit 70eea4c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 3 deletions.
12 changes: 12 additions & 0 deletions sphinx/contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ am more elaborate comment, and click "Propose File Change". On the
next page you get the option to "Send a pull request", which pings me
that you've made changes. (note that you now forked Moa)
Software Prerequisites
----------------------

Obviously, in order to build documentation you will need to install
`Sphinx <http://sphinx-doc.org/>`_ using the call::

pip install Sphinx

For Python 2.6 users `argparse <http://pypi.python.org/pypi/argparse>`_
is also required so call::

pip install argparse

Code
----
Expand Down
18 changes: 15 additions & 3 deletions sphinx/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,21 @@ Recommended prerequisites are:

sudo apt-get install python-dev

While on RHEL flavoured distribution users should call::

sudo yum install -y python-devel

- `python-yaml`: This will install a faster YAML parser, as opposed to
the python only YAML parser you would probably get when installing
through pip or easy-install. On a debian based distro::

sudo apt-get install python-yaml

While on RHEL flavoured distribution users will find this in the
`EPEL <http://fedoraproject.org/wiki/EPEL>`_ repository and should
call::
sudo yum install -y pyyaml

Git integration
...............
Expand Down Expand Up @@ -61,7 +70,10 @@ It is most convenient to install Moa from the

pip install Moa

(You might need root rights to do this)
(You might need root rights to do this)

You will definitely need `pip <http://www.pip-installer.org>`_ installed
to run the pip command above which is a replacement for easy_install.

Note that it is possible, and even recommended, to install Moa within
a `virtual environment <http://pypi.python.org/pypi/virtualenv>`_.
Expand Down

0 comments on commit 70eea4c

Please sign in to comment.