Skip to content

Commit e3d1655

Browse files
authored
Merge pull request #2330 from bsipocz/cleanup_prior_release_046
Cleanup prior release 0.4.6
2 parents c3cf26a + 68134a8 commit e3d1655

File tree

5 files changed

+35
-8
lines changed

5 files changed

+35
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ MANIFEST
1818
.ipynb_checkpoints
1919
.eggs
2020
pip-wheel-metadata
21+
.hypothesis
2122

2223
# Sphinx
2324
_build

.mailmap

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,32 @@ Adrian Damian <[email protected]> <[email protected]>
55
66
77
8+
Ayush Yadav <[email protected]>
89
Benjamin Alan Weaver <[email protected]> <[email protected]>
10+
Benjamin Alan Weaver <[email protected]> <[email protected]>
911
Brigitta Sipőcz <[email protected]>
1012
11-
Clara Brasseur <[email protected]>
13+
Caden Armstrong <[email protected]>
14+
15+
Clara Brasseur <[email protected]>
1216
1317
1418
1519
E. Madison Bray <[email protected]>
1620
1721
Edward Gomez <[email protected]>
22+
Elena Colomo <[email protected]>
1823
Eric Koch <[email protected]>
24+
Erwan Pannier <[email protected]>
1925
2026
Fred Moolekamp <[email protected]>Magnus Persson <[email protected]> <[email protected]>
2127
Hans Moritz Guenter <[email protected]>
2228
2329
2430
Jaladh Singhal <[email protected]>
31+
Javier Ballester <[email protected]>
2532
Javier Duran <[email protected]>
33+
2634
2735
2836
@@ -33,6 +41,9 @@ Javier Espinosa <[email protected]>
3341
3442
3543
44+
45+
Jennifer Medina <[email protected]>
46+
Jesus Juan Salgado <[email protected]>
3647
Jonathan Gagne <[email protected]>
3748
3849
Juan Carlos Segovia <[email protected]>
@@ -56,12 +67,15 @@ Nicholas Earl <[email protected]>
5667
Oliver Oberdorf <[email protected]>
5768
5869
70+
Raul Gutierrez <[email protected]> <Raul [email protected]>
71+
5972
6073
6174
Simon Liedtke <[email protected]>
6275
6376
6477
Syed Gilani <[email protected]>
6578
Tinuade Adeleke <[email protected]>
79+
Tim Galvin <[email protected]>
6680
Volodymyr Savchenko <[email protected]> <[email protected]>
6781
Volodymyr Savchenko <[email protected]> <[email protected]>

LICENSE.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011-2017 Astroquery Developers
1+
Copyright (c) 2011-2022 Astroquery Developers
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

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)