Merge branch 'astropy:main' into 3129-add-lowell-astorbdb-query-module

astropy · Feb 4, 2025 · 8af08bb · 8af08bb
2 parents 7e578e5 + e2db773
commit 8af08bb
Show file tree

Hide file tree

Showing 188 changed files with 11,743 additions and 14,679 deletions.
diff --git a/.github/workflows/ci_crontests.yml b/.github/workflows/ci_crontests.yml
@@ -40,7 +40,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b  # v5.3.0
+      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies

diff --git a/.github/workflows/ci_devtests.yml b/.github/workflows/ci_devtests.yml
@@ -48,7 +48,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b  # v5.3.0
+      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies
@@ -57,6 +57,6 @@ jobs:
       run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
     - name: Upload coverage to codecov
       if: contains(matrix.toxenv,'-cov')
-      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238  # v4.6.0
+      uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3  # v5.3.1
       with:
         file: ./coverage.xml
diff --git a/.github/workflows/ci_online_crontests.yml b/.github/workflows/ci_online_crontests.yml
@@ -42,7 +42,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b  # v5.3.0
+      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies

diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -42,25 +42,32 @@ jobs:
             toxenv: py39-test-oldestdeps-alldeps
             toxargs: -v
 
-          - name: Python 3.10 with all optional dependencies (MacOS X)
+          - name: OSX, py310, all optional dependencies
             os: macos-latest
             python: "3.10"
             toxenv: py310-test-alldeps
             toxargs: -v
 
-          - name: Python 3.11 with mandatory dependencies (Windows)
+          - name: Windows, py311, mandatory dependencies only
             os: windows-latest
             python: "3.11"
             toxenv: py311-test
             toxargs: -v
 
+          - name: Linux ARM, py312, all optional dependencies
+            os: ubuntu-24.04-arm
+            python: "3.12"
+            toxenv: py312-test-alldeps
+            toxargs: -v
+
+
     steps:
     - name: Checkout code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b  # v5.3.0
+      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies
@@ -69,7 +76,7 @@ jobs:
       run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
     - name: Upload coverage to codecov
       if: contains(matrix.toxenv,'-cov')
-      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238  # v4.6.0
+      uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3  # v5.3.1
       with:
         file: ./coverage.xml
 
@@ -82,7 +89,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b  # v5.3.0
+      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
       with:
         python-version: "3.9"
     - name: Run egg_info

diff --git a/.mailmap b/.mailmap
@@ -11,6 +11,8 @@ Austen Groener <[email protected]> <[email protected]>
 Ayush Yadav <[email protected]>
 Benjamin Alan Weaver <[email protected]> <[email protected]>
 Benjamin Alan Weaver <[email protected]> <[email protected]>
+Brett Morris <[email protected]> <[email protected]>
+Brian Svoboda <[email protected]> <[email protected]>
 Brigitta Sipőcz <[email protected]>
 Brigitta Sipőcz <[email protected]> <[email protected]>
 Caden Armstrong <[email protected]>
@@ -19,6 +21,8 @@ Clara Brasseur <[email protected]>
 David Collom  <[email protected]> <[email protected]>
 David Collom  <[email protected]> <[email protected]>
 David Collom  <[email protected]> <[email protected]>
+David Collom  <[email protected]> <[email protected]>
+David Gonzalez <[email protected]> <[email protected]>
 Dino Bektesevic <[email protected]>
 E. Madison Bray <[email protected]>
 E. Madison Bray <[email protected]> <[email protected]>
@@ -57,6 +61,7 @@ Jon Juaristi Campillo <[email protected]>
 Jonathan Gagne <[email protected]>
 Jordan Mirocha <[email protected]> <[email protected]>
 Jorge Fernandez Hernandez <[email protected]>
+Jorge Fernandez Hernandez <[email protected]> <[email protected]>
 Juan Carlos Segovia <[email protected]>
 Juanjo Bazán <[email protected]>
 Julien Milli <[email protected]>
@@ -91,6 +96,7 @@ Prajwel Joseph <[email protected]>
 Raul Gutierrez <[email protected]> <Raul [email protected]>
 Raul Gutierrez <[email protected]> <[email protected]>
 Rounak Agarwal <[email protected]>
+Sam Bianco <[email protected]> <[email protected]>
 Sam Lee <[email protected]>
 Sashank Mishra <[email protected]>
 Simon Conseil <[email protected]> <[email protected]>