Skip to content

Commit

Permalink
doc: fixed links
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Papior <[email protected]>
  • Loading branch information
zerothi committed Mar 31, 2017
1 parent ae2e990 commit d3d8ba2
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ To succesfully use `sisl` these Python packages must be installed:
- `setuptools`_
- `numpy`_ (`>=1.9`)
- `scipy`_
- `netcdf4-python`_
- `netCDF4 <netcdf4-py_>`_


API links
Expand Down
24 changes: 16 additions & 8 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ pip

Installing sisl using PyPi can be done using

pip install sisl
.. code-block:: bash
pip install sisl
conda
-----
Expand All @@ -24,21 +26,27 @@ Installing sisl using conda can be done using
On conda sisl is also shipped in a developer installation for more
up-to-date releases, this may be installed using:

conda install -c zerothi sisl-dev
.. code-block:: bash
conda install -c zerothi sisl-dev
Manuel installation
Manual installation
-------------------

sisl may also be installed using the regular `setup.py` script.
To do this the following packages are required to be in `PYTHONPATH`:

- `six`_
- `setuptools`_
- `numpy`_
- `scipy`_
- `netCDF4`_
- `setuptools`_
- `netCDF4 <netcdf4-py_>`_
- A fortran compiler

If the above listed items are installed, sisl can be installed

python setup.py install --prefix=<prefix>
If the above listed items are installed, sisl can be installed by first
downloading the latest release on `this page <gh-releases_>`_.
Subsequently install sisl by

.. code-block:: bash
python setup.py install --prefix=<prefix>
2 changes: 1 addition & 1 deletion docs/links.rst.dummy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.. _six: https://pypi.python.org/pypi/six
.. _setuptools: https://pypi.python.org/pypi/setuptools
.. _NetCDF: https://www.unidata.ucar.edu/netcdf
.. _netcdf4-python: http://github.com/Unidata/netcdf4-python
.. _netcdf4-py: http://github.com/Unidata/netcdf4-python
.. _numpy: http://github.com/numpy/numpy
.. _scipy: http://github.com/scipy/scipy

Expand Down

0 comments on commit d3d8ba2

Please sign in to comment.