Skip to content

Commit 68134a8

Browse files
committed
Adding sections about installing [all], etc.
1 parent ea5e0c8 commit 68134a8

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

README.rst

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,23 @@ installed using `pip <https://pypi.python.org/pypi/pip>`_ or `anaconda
5555
<http://continuum.io/>`_. Running the tests requires `curl
5656
<https://curl.haxx.se/>`_ to be installed.
5757

58-
The latest version of astroquery can be conda installed:
58+
The latest version of astroquery can be pip installed (note the --pre for
59+
picking up released developer versions):
5960

6061
.. code-block:: bash
6162
62-
$ conda install -c conda-forge astroquery
63+
$ pip install --pre astroquery
6364
64-
or pip installed:
65+
To install all the mandatory and optional dependencies add the ``[all]``
66+
identifyer to the pip command above (or use ``[docs]`` or ``[test]`` for the
67+
dependencies required to build the documentation or run the tests):
6568

6669
.. code-block:: bash
6770
68-
$ pip install --pre astroquery
71+
$ pip install --pre astroquery[all]
72+
6973
70-
and the 'bleeding edge' main version:
74+
To install the 'bleeding edge' version:
7175

7276
.. code-block:: bash
7377

docs/index.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,17 @@ already installed, please make sure you use the ``--upgrade`` install option as
4141
4242
$ pip install --pre astroquery
4343
44+
To install all the mandatory and optional dependencies add the ``[all]``
45+
identifyer to the pip command above (or use ``[docs]`` or ``[test]`` for the
46+
dependencies required to build the documentation or run the tests):
47+
48+
.. code-block:: bash
49+
50+
$ pip install --pre astroquery[all]
51+
4452
In addition to the automated releases, we also keep doing regular, tagged version for maintenance
4553
and packaging purposes. These can be ``pip`` installed without the ``--pre`` option and
46-
are available from the ``conda-forge`` conda channel.
54+
are also available from the ``conda-forge`` conda channel.
4755

4856
.. code-block:: bash
4957

0 commit comments

Comments
 (0)