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

5 files changed

Lines changed: 35 additions & 8 deletions

File tree

.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 <adrian.damian@nrc.ca> <Adrian.Damian@nrc.ca>
55
Andrew O'Brien <obrienan@uwm.edu> <marxide@users.noreply.github.com>
66
Austen Groener <Austen.Groener@gmail.com> <amg338@drexel.edu>
77
Austen Groener <Austen.Groener@gmail.com> <rocketboyausten@gmail.com>
8+
Ayush Yadav <ayushyadav@outlook.com>
89
Benjamin Alan Weaver <baweaver@lbl.gov> <benjamin.weaver@nyu.edu>
10+
Benjamin Alan Weaver <baweaver@lbl.gov> <benjamin.weaver@noirlab.edu>
911
Brigitta Sipőcz <bsipocz@gmail.com>
1012
Brigitta Sipőcz <bsipocz@gmail.com> <b.sipocz@gmail.com>
11-
Clara Brasseur <cbrasseur@stsci.edu>
13+
Caden Armstrong <cadenarmstrong@gmail.com>
14+
Clara Brasseur <cebrasseur@gmail.com> <cbrasseur@stsci.edu>
15+
Clara Brasseur <cebrasseur@gmail.com>
1216
David Collom <dmcollom@gmail.com> <david.m.collom@gmail.com>
1317
David Collom <dmcollom@gmail.com> <dcollom@lco.global>
1418
David Collom <dmcollom@gmail.com> <dcollom@localhost.localdomain>
1519
E. Madison Bray <erik.m.bray@gmail.com>
1620
E. Madison Bray <erik.m.bray@gmail.com> <embray@stsci.edu>
1721
Edward Gomez <edward@gomez.me.uk>
22+
Elena Colomo <ecolomo@sciops.esa.int>
1823
Eric Koch <koch.eric.w@gmail.com>
24+
Erwan Pannier <erwan.pannier@centralesupelec.fr>
1925
Fran Raga <franka1986@gmail.com> <All4Gis@users.noreply.github.com>
2026
Fred Moolekamp <fred3public@gmail.com>Magnus Persson <magnusp@vilhelm.nu> <vilhelmp@gmail.com>
2127
Hans Moritz Guenter <moritz.guenther@gmx.de>
2228
Henrik Norman <honke.norman@gmail.com> <Honke.norman@gmail.com>
2329
Henrik Norman <honke.norman@gmail.com> <hnorma@kth.se>
2430
Jaladh Singhal <jaladhsinghal@gmail.com>
31+
Javier Ballester <javier.ballester@ext.esa.int>
2532
Javier Duran <jduran@sciops.esa.int>
33+
Javier Duran <jduran@sciops.esa.int> <javier.duran@sciops.esa.int>
2634
Javier Duran <jduran@sciops.esa.int> <jduran@dhcp-10-66-197-109.esac.esa.int>
2735
Javier Duran <jduran@sciops.esa.int> <jduran@dhcp-10-66-197-144.esac.esa.int>
2836
Javier Duran <jduran@sciops.esa.int> <jduran@dhcp-10-66-197-161.esac.esa.int>
@@ -33,6 +41,9 @@ Javier Espinosa <javier.espinosa@esa.int>
3341
Javier Espinosa <javier.espinosa@esa.int> <64952559+jespinosaar@users.noreply.github.com>
3442
Javier Espinosa <javier.espinosa@esa.int> <javier.espinosa@sciops.esa.int>
3543
Javier Espinosa <javier.espinosa@esa.int> <jespinosa@esac01107125.home>
44+
Javier Espinosa <javier.espinosa@esa.int> <j.espinosa.aranda@gmail.com>
45+
Jennifer Medina <jmedina@stsci.edu>
46+
Jesus Juan Salgado <jesusjuansalgado@gmail.com>
3647
Jonathan Gagne <jonathan.gagne.1@gmail.com>
3748
Jordan Mirocha <mirochaj@gmail.com> <mirocha@rl1-140-39-dhcp.int.colorado.edu>
3849
Juan Carlos Segovia <juancarlos.segovia@gmail.com>
@@ -56,12 +67,15 @@ Nicholas Earl <contact@nicholasearl.me>
5667
Oliver Oberdorf <ooberdorf@gemini.edu>
5768
Oliver Oberdorf <ooberdorf@gemini.edu> <oly@oberdorf.org>
5869
Pey Lian Lim <lim@stsci.edu> <2090236+pllim@users.noreply.github.com>
70+
Raul Gutierrez <raul.gutierrez@sciops.esa.int> <Raul Gutierrez@sciops.esa.int>
71+
Raul Gutierrez <raul.gutierrez@sciops.esa.int> <Raul.Gutierrez@sciops.esa.int>
5972
Simon Conseil <contact@saimon.org> <sconseil@gemini.edu>
6073
Simon Conseil <contact@saimon.org> <simon.conseil@univ-lyon1.fr>
6174
Simon Liedtke <liedtke.simon@googlemail.com>
6275
Syed Gilani <sgilani@stsci.edu> <59292422+syed-gilani@users.noreply.github.com>
6376
Syed Gilani <sgilani@stsci.edu> <sgilani@sgilani.local.stsci.edu>
6477
Syed Gilani <sgilani@dmdtemp2020.local.stsci.edu>
6578
Tinuade Adeleke <summittinuade@gmail.com>
79+
Tim Galvin <gal16b@csiro.au>
6680
Volodymyr Savchenko <contact@volodymyrsavchenko.com> <Volodymyr.Savchenko@unige.ch>
6781
Volodymyr Savchenko <contact@volodymyrsavchenko.com> <volodymyrss@users.noreply.github.com>

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)