Skip to content

Commit 653f214

Browse files
keflavichkeflavich
committed
Merge branch 'main' of github.com:astropy/astroquery into higal
2 parents c30e2cd + 011c3dc commit 653f214

File tree

479 files changed

+29133
-42297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

479 files changed

+29133
-42297
lines changed

‎.github/workflows/cancel_workflows.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/ci_crontests.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: CI-crontests
2+
3+
on:
4+
push:
5+
# Run this job on release tags, but not on pushes to the main branch
6+
tags:
7+
- '*'
8+
schedule:
9+
# run every Friday at 23:00 UTC
10+
- cron: '0 23 * * 5'
11+
workflow_dispatch:
12+
13+
permissions:
14+
contents: read
15+
16+
jobs:
17+
tests:
18+
name: ${{ matrix.name }}
19+
runs-on: ${{ matrix.os }}
20+
if: github.repository == 'astropy/astroquery'
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
include:
25+
- name: py3.11 all dev deps online
26+
os: ubuntu-latest
27+
python: '3.11'
28+
toxenv: py311-test-alldeps-devdeps-online
29+
toxargs: -v
30+
toxposargs: -v --durations=50
31+
32+
- name: Windows py3.9 all deps online
33+
os: windows-latest
34+
python: '3.9'
35+
toxenv: py39-test-alldeps-online
36+
toxargs: -v
37+
toxposargs: -v --durations=50
38+
39+
- name: py3.11 pre-release all deps
40+
os: ubuntu-latest
41+
python: '3.11'
42+
toxenv: py311-test-alldeps-predeps
43+
toxargs: -v
44+
toxposargs: -v
45+
46+
- name: Documentation build with linkcheck
47+
os: ubuntu-latest
48+
python: '3.10'
49+
toxenv: linkcheck
50+
51+
steps:
52+
- name: Checkout code
53+
uses: actions/checkout@v3
54+
with:
55+
fetch-depth: 0
56+
- name: Set up Python
57+
uses: actions/setup-python@v4
58+
with:
59+
python-version: ${{ matrix.python }}
60+
- name: Install Python dependencies
61+
run: python -m pip install --upgrade tox
62+
- name: Run tests
63+
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}

‎.github/workflows/ci_devtests.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# This test job is separated out into its own workflow to be able to obtain a separate badge for it
2+
name: CI-devtest
3+
4+
on:
5+
push:
6+
branches:
7+
- main
8+
tags:
9+
- '*'
10+
pull_request:
11+
branches:
12+
- main
13+
schedule:
14+
# run every Monday at 5am UTC
15+
- cron: '0 5 * * 1'
16+
workflow_dispatch:
17+
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
22+
permissions:
23+
contents: read
24+
25+
jobs:
26+
tests:
27+
name: ${{ matrix.name }}
28+
runs-on: ${{ matrix.os }}
29+
strategy:
30+
fail-fast: true
31+
matrix:
32+
include:
33+
- name: dev dependencies with all dependencies with coverage
34+
os: ubuntu-latest
35+
python: '3.11'
36+
toxenv: py311-test-alldeps-devdeps-cov
37+
toxargs: -v
38+
39+
steps:
40+
- name: Checkout code
41+
uses: actions/checkout@v3
42+
with:
43+
fetch-depth: 0
44+
- name: Set up Python
45+
uses: actions/setup-python@v4
46+
with:
47+
python-version: ${{ matrix.python }}
48+
- name: Install Python dependencies
49+
run: python -m pip install --upgrade tox
50+
- name: Run tests
51+
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
52+
- name: Upload coverage to codecov
53+
if: contains(matrix.toxenv,'-cov')
54+
uses: codecov/codecov-action@v3
55+
with:
56+
file: ./coverage.xml

‎.github/workflows/ci_tests.yml

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Developer version testing as well as cron testings are in separate workflows
12
name: CI
23

34
on:
@@ -12,6 +13,14 @@ on:
1213
schedule:
1314
# run every Monday at 5am UTC
1415
- cron: '0 5 * * 1'
16+
workflow_dispatch:
17+
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
22+
permissions:
23+
contents: read
1524

1625
jobs:
1726
tests:
@@ -27,16 +36,10 @@ jobs:
2736
python: 3.x
2837
toxenv: codestyle
2938

30-
- name: oldest dependencies
39+
- name: oldest version for all dependencies
3140
os: ubuntu-latest
3241
python: 3.7
33-
toxenv: py37-test-oldestdeps
34-
toxargs: -v
35-
36-
- name: astropy dev with all dependencies with coverage
37-
os: ubuntu-latest
38-
python: '3.10'
39-
toxenv: py310-test-alldeps-devastropy-cov
42+
toxenv: py37-test-oldestdeps-alldeps
4043
toxargs: -v
4144

4245
- name: Python 3.8 with all optional dependencies (MacOS X)
@@ -53,11 +56,11 @@ jobs:
5356

5457
steps:
5558
- name: Checkout code
56-
uses: actions/checkout@v2
59+
uses: actions/checkout@v3
5760
with:
5861
fetch-depth: 0
5962
- name: Set up Python
60-
uses: actions/setup-python@v2
63+
uses: actions/setup-python@v4
6164
with:
6265
python-version: ${{ matrix.python }}
6366
- name: Install Python dependencies
@@ -66,41 +69,20 @@ jobs:
6669
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
6770
- name: Upload coverage to codecov
6871
if: contains(matrix.toxenv,'-cov')
69-
uses: codecov/codecov-action@v2
72+
uses: codecov/codecov-action@v3
7073
with:
7174
file: ./coverage.xml
7275

73-
# This needs to be outside of matrix because if is not supported
74-
# for only one job in a matrix. But once that is supported, this can go
75-
# back to the matrix above.
76-
remote_data:
77-
name: Python 3.8 with all dependencies with remote data
78-
if: github.event_name == 'schedule' && github.repository == 'astropy/astroquery'
79-
runs-on: ubuntu-latest
80-
steps:
81-
- name: Checkout code
82-
uses: actions/checkout@v2
83-
with:
84-
fetch-depth: 0
85-
- name: Set up Python
86-
uses: actions/setup-python@v2
87-
with:
88-
python-version: '3.8'
89-
- name: Install Python dependencies
90-
run: python -m pip install --upgrade tox
91-
- name: Run tests
92-
run: tox -v -e py38-test-alldeps-devastropy -- --remote-data
93-
9476
egg_info:
9577
name: egg_info with Python 3.7
9678
runs-on: ubuntu-latest
9779
steps:
9880
- name: Checkout code
99-
uses: actions/checkout@v2
81+
uses: actions/checkout@v3
10082
with:
10183
fetch-depth: 0
10284
- name: Set up Python
103-
uses: actions/setup-python@v2
85+
uses: actions/setup-python@v4
10486
with:
10587
python-version: 3.7
10688
- name: Run egg_info

‎.github/workflows/codeql-analysis.yml

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
121
name: "CodeQL"
132

143
on:
15-
push:
16-
branches: [ main ]
17-
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [ main ]
4+
schedule:
5+
- cron: '0 6 * * 1'
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
11+
permissions:
12+
contents: read
2013

2114
jobs:
2215
analyze:
16+
permissions:
17+
actions: read # for github/codeql-action/init to get workflow details
18+
contents: read # for actions/checkout to fetch code
19+
security-events: write # for github/codeql-action/autobuild to send a status report
2320
name: Analyze
2421
runs-on: ubuntu-latest
2522

2623
strategy:
2724
fail-fast: false
2825
matrix:
2926
language: [ 'python' ]
30-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
31-
# Learn more:
32-
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
3327

3428
steps:
3529
- name: Checkout repository
36-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3731

3832
# Initializes the CodeQL tools for scanning.
3933
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@v1
34+
uses: github/codeql-action/init@v2
4135
with:
4236
languages: ${{ matrix.language }}
4337
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -48,7 +42,7 @@ jobs:
4842
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4943
# If this step fails, then you should remove it and run the build manually (see below)
5044
- name: Autobuild
51-
uses: github/codeql-action/autobuild@v1
45+
uses: github/codeql-action/autobuild@v2
5246

5347
# ℹ️ Command-line programs to run using the OS shell.
5448
# 📚 https://git.io/JvXDl
@@ -62,4 +56,4 @@ jobs:
6256
# make release
6357

6458
- name: Perform CodeQL Analysis
65-
uses: github/codeql-action/analyze@v1
59+
uses: github/codeql-action/analyze@v2

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ MANIFEST
1818
.ipynb_checkpoints
1919
.eggs
2020
pip-wheel-metadata
21+
.hypothesis
22+
doctests.py
23+
coverage.xml
2124

2225
# Sphinx
2326
_build

‎.mailmap

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,33 @@ 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+
James Dempsey <james.dempsey@csiro.au> <dem040@csiro.au>
32+
Javier Ballester <javier.ballester@ext.esa.int>
2533
Javier Duran <jduran@sciops.esa.int>
34+
Javier Duran <jduran@sciops.esa.int> <javier.duran@sciops.esa.int>
2635
Javier Duran <jduran@sciops.esa.int> <jduran@dhcp-10-66-197-109.esac.esa.int>
2736
Javier Duran <jduran@sciops.esa.int> <jduran@dhcp-10-66-197-144.esac.esa.int>
2837
Javier Duran <jduran@sciops.esa.int> <jduran@dhcp-10-66-197-161.esac.esa.int>
@@ -33,6 +42,9 @@ Javier Espinosa <javier.espinosa@esa.int>
3342
Javier Espinosa <javier.espinosa@esa.int> <64952559+jespinosaar@users.noreply.github.com>
3443
Javier Espinosa <javier.espinosa@esa.int> <javier.espinosa@sciops.esa.int>
3544
Javier Espinosa <javier.espinosa@esa.int> <jespinosa@esac01107125.home>
45+
Javier Espinosa <javier.espinosa@esa.int> <j.espinosa.aranda@gmail.com>
46+
Jennifer Medina <jmedina@stsci.edu>
47+
Jesus Juan Salgado <jesusjuansalgado@gmail.com>
3648
Jonathan Gagne <jonathan.gagne.1@gmail.com>
3749
Jordan Mirocha <mirochaj@gmail.com> <mirocha@rl1-140-39-dhcp.int.colorado.edu>
3850
Juan Carlos Segovia <juancarlos.segovia@gmail.com>
@@ -56,9 +68,15 @@ Nicholas Earl <contact@nicholasearl.me>
5668
Oliver Oberdorf <ooberdorf@gemini.edu>
5769
Oliver Oberdorf <ooberdorf@gemini.edu> <oly@oberdorf.org>
5870
Pey Lian Lim <lim@stsci.edu> <2090236+pllim@users.noreply.github.com>
71+
Raul Gutierrez <raul.gutierrez@sciops.esa.int> <Raul Gutierrez@sciops.esa.int>
72+
Raul Gutierrez <raul.gutierrez@sciops.esa.int> <Raul.Gutierrez@sciops.esa.int>
5973
Simon Conseil <contact@saimon.org> <sconseil@gemini.edu>
6074
Simon Conseil <contact@saimon.org> <simon.conseil@univ-lyon1.fr>
6175
Simon Liedtke <liedtke.simon@googlemail.com>
76+
Syed Gilani <sgilani@stsci.edu> <59292422+syed-gilani@users.noreply.github.com>
77+
Syed Gilani <sgilani@stsci.edu> <sgilani@sgilani.local.stsci.edu>
78+
Syed Gilani <sgilani@dmdtemp2020.local.stsci.edu>
6279
Tinuade Adeleke <summittinuade@gmail.com>
80+
Tim Galvin <gal16b@csiro.au>
6381
Volodymyr Savchenko <contact@volodymyrsavchenko.com> <Volodymyr.Savchenko@unige.ch>
6482
Volodymyr Savchenko <contact@volodymyrsavchenko.com> <volodymyrss@users.noreply.github.com>

‎.readthedocs.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ python:
99
path: .
1010
extra_requirements:
1111
- docs
12-
- all
1312

1413
sphinx:
1514
fail_on_warning: true

0 commit comments

Comments
 (0)