Merge branch 'main' of github.com:astropy/astroquery into higal

Author: keflavich

.github/workflows/cancel_workflows.yml

@@ -0,0 +1,63 @@
+name: CI-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.11 all dev deps online
+            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
+            toxargs: -v
+            toxposargs: -v
+
+          - name: Documentation build with linkcheck
+            os: ubuntu-latest
+            python: '3.10'
+            toxenv: linkcheck
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      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 }}

.github/workflows/ci_crontests.yml

@@ -0,0 +1,56 @@
+# This test job is separated out into its own workflow to be able to obtain a separate badge for it
+name: CI-devtest
+
+on:
+  push:
+    branches:
+    - main
+    tags:
+    - '*'
+  pull_request:
+    branches:
+    - main
+  schedule:
+    # run every Monday at 5am UTC
+    - cron: '0 5 * * 1'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  tests:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - name: dev dependencies with all dependencies with coverage
+            os: ubuntu-latest
+            python: '3.11'
+            toxenv: py311-test-alldeps-devdeps-cov
+            toxargs: -v
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      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 }}
+    - name: Upload coverage to codecov
+      if: contains(matrix.toxenv,'-cov')
+      uses: codecov/codecov-action@v3
+      with:
+        file: ./coverage.xml

.github/workflows/ci_devtests.yml

@@ -1,3 +1,4 @@
+# Developer version testing as well as cron testings are in separate workflows
 name: CI
 
 on:
@@ -12,6 +13,14 @@ on:
   schedule:
     # run every Monday at 5am UTC
     - cron: '0 5 * * 1'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
 
 jobs:
   tests:
@@ -27,16 +36,10 @@ jobs:
             python: 3.x
             toxenv: codestyle
 
-          - name: oldest dependencies
+          - name: oldest version for all dependencies
             os: ubuntu-latest
             python: 3.7
-            toxenv: py37-test-oldestdeps
-            toxargs: -v
-
-          - name: astropy dev with all dependencies with coverage
-            os: ubuntu-latest
-            python: '3.10'
-            toxenv: py310-test-alldeps-devastropy-cov
+            toxenv: py37-test-oldestdeps-alldeps
             toxargs: -v
 
           - name: Python 3.8 with all optional dependencies (MacOS X)
@@ -53,11 +56,11 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies
@@ -66,41 +69,20 @@ jobs:
       run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
     - name: Upload coverage to codecov
       if: contains(matrix.toxenv,'-cov')
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
       with:
         file: ./coverage.xml
 
-  # This needs to be outside of matrix because if is not supported
-  # for only one job in a matrix. But once that is supported, this can go
-  # back to the matrix above.
-  remote_data:
-    name: Python 3.8 with all dependencies with remote data
-    if: github.event_name == 'schedule' && github.repository == 'astropy/astroquery'
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.8'
-    - name: Install Python dependencies
-      run: python -m pip install --upgrade tox
-    - name: Run tests
-      run: tox -v -e py38-test-alldeps-devastropy -- --remote-data
-
   egg_info:
     name: egg_info with Python 3.7
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.7
     - name: Run egg_info

.github/workflows/ci_tests.yml

@@ -1,43 +1,37 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 on:
-  push:
-    branches: [ main ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ main ]
+  schedule:
+    - cron: '0 6 * * 1'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
 
 jobs:
   analyze:
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/autobuild to send a status report
     name: Analyze
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
         language: [ 'python' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # 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
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -48,7 +42,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -62,4 +56,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/codeql-analysis.yml

@@ -18,6 +18,9 @@ MANIFEST
 .ipynb_checkpoints
 .eggs
 pip-wheel-metadata
+.hypothesis
+doctests.py
+coverage.xml
 
 # Sphinx
 _build

.gitignore

@@ -5,24 +5,33 @@ Adrian Damian <[email protected]> <[email protected]>
 Andrew O'Brien <[email protected]> <[email protected]>
 Austen Groener <[email protected]> <[email protected]>
 Austen Groener <[email protected]> <[email protected]>
+Ayush Yadav <[email protected]>
 Benjamin Alan Weaver <[email protected]> <[email protected]>
+Benjamin Alan Weaver <[email protected]> <[email protected]>
 Brigitta Sipőcz <[email protected]>
 Brigitta Sipőcz <[email protected]> <[email protected]>
-Clara Brasseur <[email protected]>
+Caden Armstrong <[email protected]>
+Clara Brasseur <[email protected]> <[email protected]>
+Clara Brasseur <[email protected]>
 David Collom  <[email protected]> <[email protected]>
 David Collom  <[email protected]> <[email protected]>
 David Collom  <[email protected]> <[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]>
 Hans Moritz Guenter <[email protected]>
 Henrik Norman <[email protected]> <[email protected]>
 Henrik Norman <[email protected]> <[email protected]>
 Jaladh Singhal <[email protected]>
+James Dempsey <[email protected]> <[email protected]>
+Javier Ballester <[email protected]>
 Javier Duran <[email protected]>
+Javier Duran <[email protected]> <[email protected]>
 Javier Duran <[email protected]> <[email protected]>
 Javier Duran <[email protected]> <[email protected]>
 Javier Duran <[email protected]> <[email protected]>
@@ -33,6 +42,9 @@ Javier Espinosa <[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]>
 Jonathan Gagne <[email protected]>
 Jordan Mirocha <[email protected]> <[email protected]>
 Juan Carlos Segovia <[email protected]>
@@ -56,9 +68,15 @@ Nicholas Earl <[email protected]>
 Oliver Oberdorf <[email protected]>
 Oliver Oberdorf <[email protected]> <[email protected]>
 Pey Lian Lim <[email protected]> <[email protected]>
+Raul Gutierrez <[email protected]> <Raul [email protected]>
+Raul Gutierrez <[email protected]> <[email protected]>
 Simon Conseil <[email protected]> <[email protected]>
 Simon Conseil <[email protected]> <[email protected]>
 Simon Liedtke <[email protected]>
+Syed Gilani <[email protected]> <[email protected]>
+Syed Gilani <[email protected]> <[email protected]>
+Syed Gilani <[email protected]>
 Tinuade Adeleke <[email protected]>
+Tim Galvin <[email protected]>
 Volodymyr Savchenko <[email protected]> <[email protected]>
 Volodymyr Savchenko <[email protected]> <[email protected]>

.mailmap

@@ -9,7 +9,6 @@ python:
        path: .
        extra_requirements:
           - docs
-          - all
 
 sphinx:
    fail_on_warning: true