Skip to content

Commit

Permalink
Merge branch 'astropy:main' into maint-vizier-module
Browse files Browse the repository at this point in the history
  • Loading branch information
ManonMarchand committed Jun 20, 2024
2 parents 0ffd5d4 + de6260f commit f4d28a3
Show file tree
Hide file tree
Showing 44 changed files with 1,202 additions and 756 deletions.
24 changes: 5 additions & 19 deletions .github/workflows/ci_crontests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
tags:
- '*'
schedule:
# run every Friday at 23:00 UTC
- cron: '0 23 * * 5'
# run every Friday at 22:00 UTC
- cron: '0 22 * * 5'
workflow_dispatch:

permissions:
Expand All @@ -22,24 +22,10 @@ jobs:
fail-fast: false
matrix:
include:
- name: py3.11 all dev deps online
- name: py3.12 pre-release all deps
os: ubuntu-latest
python: '3.11'
toxenv: py311-test-alldeps-devdeps-online
toxargs: -v
toxposargs: -v --durations=50

- name: Windows py3.9 all deps online
os: windows-latest
python: '3.9'
toxenv: py39-test-alldeps-online
toxargs: -v
toxposargs: -v --durations=50

- name: py3.11 pre-release all deps
os: ubuntu-latest
python: '3.11'
toxenv: py311-test-alldeps-predeps
python: '3.12'
toxenv: py312-test-alldeps-predeps
toxargs: -v
toxposargs: -v

Expand Down
51 changes: 51 additions & 0 deletions .github/workflows/ci_online_crontests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: CI-online-crontests

on:
push:
# Run this job on release tags, but not on pushes to the main branch
tags:
- '*'
schedule:
# run every Friday at 23:00 UTC
- cron: '0 23 * * 5'
workflow_dispatch:

permissions:
contents: read

jobs:
tests:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
if: github.repository == 'astropy/astroquery'
strategy:
fail-fast: false
matrix:
include:
- name: py3.12 all dev deps online
os: ubuntu-latest
python: '3.12'
toxenv: py312-test-alldeps-devdeps-online
toxargs: -v
toxposargs: -v --durations=50

- name: Windows py3.9 all deps online
os: windows-latest
python: '3.9'
toxenv: py39-test-alldeps-online
toxargs: -v
toxposargs: -v --durations=50

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install Python dependencies
run: python -m pip install --upgrade tox
- name: Run tests
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
26 changes: 25 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ Adam Ginsburg <[email protected]> <[email protected]>
Adam Ginsburg <[email protected]> <[email protected]>
Adrian Damian <[email protected]> <[email protected]>
Andrew O'Brien <[email protected]> <[email protected]>
Angel Ruiz <[email protected]>
Antonio Ortega <[email protected]>
Ari Pollak <[email protected]> <[email protected]>
Austen Groener <[email protected]> <[email protected]>
Austen Groener <[email protected]> <[email protected]>
Ayush Yadav <[email protected]>
Expand All @@ -16,19 +19,23 @@ Clara Brasseur <[email protected]>
David Collom <[email protected]> <[email protected]>
David Collom <[email protected]> <[email protected]>
David Collom <[email protected]> <[email protected]>
Dino Bektesevic <[email protected]>
E. Madison Bray <[email protected]>
E. Madison Bray <[email protected]> <[email protected]>
Edward Gomez <[email protected]>
Elena Colomo <[email protected]>
Eric Koch <[email protected]>
Erwan Pannier <[email protected]>
Fran Raga <[email protected]> <[email protected]>
Fred Moolekamp <[email protected]>Magnus Persson <[email protected]> <[email protected]>
Fred Moolekamp <[email protected]>
Hadrien Devillepoix <[email protected]>
Hans Moritz Guenter <[email protected]>
Henrik Norman <[email protected]> <[email protected]>
Henrik Norman <[email protected]> <[email protected]>
Henrik Norman <[email protected]> <[email protected]>
Jaladh Singhal <[email protected]>
James Dempsey <[email protected]> <[email protected]>
James Guillochon <[email protected]>
Javier Ballester <[email protected]>
Javier Duran <[email protected]>
Javier Duran <[email protected]> <[email protected]>
Expand All @@ -43,33 +50,49 @@ Javier Espinosa <[email protected]> <[email protected]
Javier Espinosa <[email protected]> <[email protected]>
Javier Espinosa <[email protected]> <[email protected]>
Javier Espinosa <[email protected]> <[email protected]>
Javier Espinosa <[email protected]> <[email protected]>
Jennifer Medina <[email protected]>
Jesus Juan Salgado <[email protected]>
Jon Juaristi Campillo <[email protected]>
Jonathan Gagne <[email protected]>
Jordan Mirocha <[email protected]> <[email protected]>
Jorge Fernandez Hernandez <[email protected]>
Juan Carlos Segovia <[email protected]>
Juanjo Bazán <[email protected]>
Julien Milli <[email protected]>
Julien Woillez <[email protected]> <[email protected]>
Julien Woillez <[email protected]> <[email protected]>
Kathleen Kiker <[email protected]> <[email protected]>
Kelvin Lee <[email protected]>
Kyle Willett <[email protected]>
Larry Bradley <[email protected]>
Loïc Séguin-C <[email protected]> <[email protected]>
Luis Valero Martín <[email protected]>
Madhura Parikh <[email protected]>
Magnus Persson <[email protected]>
Magnus Persson <[email protected]> <[email protected]>
Manon Marchand <[email protected]>
Maria H. Sarmiento <[email protected]>
Matthew Craig <[email protected]>
Matthieu Baumann <[email protected]> <[email protected]>
Michael Mommert <[email protected]> <[email protected]>
Michael Mommert <[email protected]> <[email protected]>
Michael St. Clair <[email protected]>
Michael St. Clair <[email protected]> <[email protected]>
Michele Costa <[email protected]>
Miguel de Val-Borro <[email protected]> <[email protected]>
Natalie Korzh <[email protected]> <[email protected]>
Naveen Srinivasan <[email protected]>
Nicholas Earl <[email protected]>
Oliver Oberdorf <[email protected]>
Oliver Oberdorf <[email protected]> <[email protected]>
Pey Lian Lim <[email protected]> <[email protected]>
Prajwel Joseph <[email protected]>
Raul Gutierrez <[email protected]> <Raul [email protected]>
Raul Gutierrez <[email protected]> <[email protected]>
Rounak Agarwal <[email protected]>
Sam Lee <[email protected]>
Sashank Mishra <[email protected]>
Simon Conseil <[email protected]> <[email protected]>
Simon Conseil <[email protected]> <[email protected]>
Simon Liedtke <[email protected]>
Expand All @@ -78,5 +101,6 @@ Syed Gilani <[email protected]> <[email protected]>
Syed Gilani <[email protected]>
Tinuade Adeleke <[email protected]>
Tim Galvin <[email protected]>
Tomas Alonso Albi <[email protected]>
Volodymyr Savchenko <[email protected]> <[email protected]>
Volodymyr Savchenko <[email protected]> <[email protected]>
28 changes: 28 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ New Tools and Services
Service fixes and enhancements
------------------------------

alma
^^^^

- Added method to return quantities instead of values and regions footprint in alma [#2855]

- Added support for frequency_resolution in KHz [#3035]

mpc
^^^

Expand All @@ -18,6 +25,12 @@ linelists.cdms

- Fix result parsing incompatibility with astropy 6.1 on Windows systems. [#3008]

ogle
^^^^

- Change URL to https and thus making the module functional again. [#3048]


splatalogue
^^^^^^^^^^^

Expand All @@ -36,6 +49,11 @@ skyview
- Overlay arguments ``lut``, ``grid``, and ``gridlabel`` are removed, as they
only apply to output types not returned by Astroquery [#2979]

vsa
^^^

- Updating base URL to fix 404 responses. [#3033]


Infrastructure, Utility and Other Changes and Additions
-------------------------------------------------------
Expand Down Expand Up @@ -73,6 +91,16 @@ jplhorizons

- Add missing column definitions, especially for ``refraction=True`` and ``extra_precision=True``. [#2986]

mast
^^^^

- Fix bug in which the ``local_path`` parameter for the ``mast.observations.download_file`` method does not accept a directory. [#3016]

- Optimize remote test suite to improve performance and reduce execution time. [#3036]

- Add ``verbose`` parameter to modulate output in ``mast.observations.download_products`` method. [#3031]



0.4.7 (2024-03-08)
==================
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011-2023 Astroquery Developers
Copyright (c) 2011-2024 Astroquery Developers
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
4 changes: 2 additions & 2 deletions astroquery/alma/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class Conf(_config.ConfigNamespace):

conf = Conf()

from .core import Alma, AlmaClass, ALMA_BANDS
from .core import Alma, AlmaClass, ALMA_BANDS, get_enhanced_table

__all__ = ['Alma', 'AlmaClass',
'Conf', 'conf', 'ALMA_BANDS'
'Conf', 'conf', 'ALMA_BANDS', 'get_enhanced_table'
]
Loading

0 comments on commit f4d28a3

Please sign in to comment.