From a6d47ec61f57b20b4b6f0111881cad8ab349f1db Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Mon, 9 Dec 2024 22:25:12 -0500 Subject: [PATCH] Run astroquery-based tests in both orbit jobs to hit multiple astroquery versions --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6f1235c3..624d8e6f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: REQUIRES_JAX: false - os: ubuntu-latest python-version: "3.12" - TEST_FILES: tests/test_orbit.py -k test_energy_jacobi_conservation + TEST_FILES: tests/test_orbit.py -k 'test_energy_jacobi_conservation or from_name' REQUIRES_PYNBODY: true REQUIRES_ASTROPY: true REQUIRES_ASTROQUERY: true @@ -130,7 +130,7 @@ jobs: REQUIRES_JAX: false - os: ubuntu-latest python-version: "3.11" - TEST_FILES: tests/test_orbit.py -k test_energy_jacobi_conservation + TEST_FILES: tests/test_orbit.py -k 'test_energy_jacobi_conservation or from_name' REQUIRES_PYNBODY: true REQUIRES_ASTROPY: true REQUIRES_ASTROQUERY: true @@ -146,7 +146,7 @@ jobs: REQUIRES_JAX: false - os: ubuntu-latest python-version: "3.10" - TEST_FILES: tests/test_orbit.py -k test_energy_jacobi_conservation + TEST_FILES: tests/test_orbit.py -k 'test_energy_jacobi_conservation or from_name' REQUIRES_PYNBODY: true REQUIRES_ASTROPY: true REQUIRES_ASTROQUERY: true @@ -162,7 +162,7 @@ jobs: REQUIRES_JAX: false - os: ubuntu-latest python-version: 3.9 - TEST_FILES: tests/test_orbit.py -k test_energy_jacobi_conservation + TEST_FILES: tests/test_orbit.py -k 'test_energy_jacobi_conservation or from_name' REQUIRES_PYNBODY: true REQUIRES_ASTROPY: true REQUIRES_ASTROQUERY: true @@ -178,7 +178,7 @@ jobs: REQUIRES_JAX: false - os: ubuntu-latest python-version: 3.8 - TEST_FILES: tests/test_orbit.py -k test_energy_jacobi_conservation + TEST_FILES: tests/test_orbit.py -k 'test_energy_jacobi_conservation or from_name' REQUIRES_PYNBODY: true REQUIRES_ASTROPY: true REQUIRES_ASTROQUERY: true @@ -194,7 +194,7 @@ jobs: REQUIRES_JAX: false - os: macos-13 python-version: "3.12" - TEST_FILES: tests/test_orbit.py -k test_energy_jacobi_conservation + TEST_FILES: tests/test_orbit.py -k 'test_energy_jacobi_conservation or from_name' REQUIRES_PYNBODY: true REQUIRES_ASTROPY: true REQUIRES_ASTROQUERY: true @@ -252,7 +252,7 @@ jobs: if: ${{ matrix.REQUIRES_ASTROPY }} run: pip install astropy pyerfa - name: Install astroquery (latest release) - if: ${{ matrix.REQUIRES_ASTROQUERY && endsWith(matrix.TEST_FILES,'-k test_energy_jacobi_conservation') }} + if: ${{ matrix.REQUIRES_ASTROQUERY && contains(matrix.TEST_FILES,'test_energy_jacobi_conservation or from_name') }} run: pip install astroquery - name: Install astroquery (bleeding edge) if: ${{ matrix.REQUIRES_ASTROQUERY && contains(matrix.TEST_FILES,'not test_energy_jacobi_conservation') }}