stick to astroquery 0.4.7 for now

SNflows · Jan 25, 2025 · 927478b · 927478b
1 parent 2102e1d
commit 927478b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -100,8 +100,6 @@ jobs:
       env:
         FLOWS_CONFIG: ${{ secrets.FLOWS_CONFIG }}
         FLOWS_API_TOKEN: ${{ secrets.FLOWS_API_TOKEN }}
-        CASSJOBS_WSID: ${{ secrets.CASSJOBS_WSID }}
-        CASSJOBS_PASSWORD: ${{ secrets.CASSJOBS_PASSWORD }}
       run: |
         python -m pip install --upgrade pip wheel
         pip install -r requirements.txt

diff --git a/README.md b/README.md
@@ -80,17 +80,6 @@ Text coming soon...
 # pipeline = False
 token = None
 
-# casjobs:
-#   wsid and password required for run_catalogs.py,
-#   user registration at
-#   https://galex.stsci.edu/casjobs/CreateAccount.aspx
-#   wsid can be found at
-#   https://galex.stsci.edu/casjobs/changedetails.aspx
-#   after login
-[casjobs]
-# wsid = $CASJOBS_WSID/None
-# password = $CASJOBS_PASSWORD/None
-
 # database:
 #   username and password required for run_catalogs.py,
 #   the user is a registered user in the flows database

diff --git a/flows/catalogs.py b/flows/catalogs.py
@@ -157,7 +157,7 @@ def query_simbad(coo_centre, radius=24 * u.arcmin):
 
     s = Simbad()
     s.ROW_LIMIT = 0
-    s.add_votable_fields('ra', 'dec', 'pmra', 'pmdec')
+    s.add_votable_fields('ra(d;A;ICRS;J2000)', 'dec(d;D;ICRS;2000)', 'pmra', 'pmdec')
     s.add_votable_fields('otype')
     s.add_votable_fields('flux(B)', 'flux(V)', 'flux(R)', 'flux(I)', 'flux(J)', 'flux(H)', 'flux(K)')
     s.add_votable_fields('flux(u)', 'flux(g)', 'flux(r)', 'flux(i)', 'flux(z)')
@@ -174,8 +174,8 @@ def query_simbad(coo_centre, radius=24 * u.arcmin):
 
     # Rename columns:
     results.rename_column('MAIN_ID', 'main_id')
-    results.rename_column('RA', 'ra')
-    results.rename_column('DEC', 'dec')
+    results.rename_column('RA_d_A_ICRS_J2000', 'ra')
+    results.rename_column('DEC_d_D_ICRS_2000', 'dec')
     results.rename_column('PMRA', 'pmra')
     results.rename_column('PMDEC', 'pmdec')
     results.rename_column('FLUX_B', 'B_mag')
@@ -203,7 +203,7 @@ def query_simbad(coo_centre, radius=24 * u.arcmin):
 
     # Build sky coordinates object:
     simbad = SkyCoord(ra=results['ra'], dec=results['dec'], pm_ra_cosdec=results['pmra'], pm_dec=results['pmdec'],
-                      frame='icrs', obstime='J2000', unit=u.deg)
+                      frame='icrs', obstime='J2000')
 
     return results, simbad
 

diff --git a/requirements.txt b/requirements.txt
@@ -17,6 +17,6 @@ pytz >= 2024.2
 sep-pjw >= 1.3.5
 astroalign >= 2.5.1
 networkx >= 3.3
-astroquery >= 0.4.7
+astroquery == 0.4.7 # TODO version >= 0.4.9 brings changes which messes with catalogs.py:query_simbad() - any expert want to have a crack at this?
 tendrils >= 0.3.2
 healpy >= 1.17.3