Skip to content

Commit c88955f

Browse files
committed
Merge branch 'main' into noirlab-archive
* main: (36 commits) Updates to mast_cut GAIAPCR-1368 Include PR reference number Minimal changes to catalogs docs Updated docs Updated main page and mast_query page Bump the actions group with 2 updates changelog Be more robust in getting column configuration GAIAPCR-1368 new retrieval type RESIDUAL_IMAGE fix an error catch codestyle fix cdms remote tests doctest output whitespace fix variable name remove unnecessary text now jplspec / cdms get_molecule behave closer to the same factor out parse_molid move unique sector logic into helper function test coverage for condition when no sectors for target add changelog entry ...
2 parents 2954d4b + 88c4dbf commit c88955f

54 files changed

Lines changed: 2575 additions & 890 deletions

Some content is hidden

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

.github/workflows/ci_crontests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout code
39-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
39+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4040
with:
4141
fetch-depth: 0
4242
- name: Set up Python

.github/workflows/ci_devtests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout code
47-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
47+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4848
with:
4949
fetch-depth: 0
5050
- name: Set up Python
@@ -57,6 +57,6 @@ jobs:
5757
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
5858
- name: Upload coverage to codecov
5959
if: contains(matrix.toxenv,'-cov')
60-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
60+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
6161
with:
6262
file: ./coverage.xml

.github/workflows/ci_online_crontests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout code
41-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
41+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4242
with:
4343
fetch-depth: 0
4444
- name: Set up Python

.github/workflows/ci_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
steps:
6565
- name: Checkout code
66-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
66+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6767
with:
6868
fetch-depth: 0
6969
- name: Set up Python
@@ -76,7 +76,7 @@ jobs:
7676
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
7777
- name: Upload coverage to codecov
7878
if: contains(matrix.toxenv,'-cov')
79-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
79+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
8080
with:
8181
file: ./coverage.xml
8282

@@ -85,7 +85,7 @@ jobs:
8585
runs-on: ubuntu-latest
8686
steps:
8787
- name: Checkout code
88-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
88+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
8989
with:
9090
fetch-depth: 0
9191
- name: Set up Python

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
30+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3131

3232
# Initializes the CodeQL tools for scanning.
3333
- name: Initialize CodeQL

CHANGES.rst

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ heasarc
3030
- Add support for uploading tables when using TAP directly through ``query_tap``. [#3403]
3131
- Add automatic guessing for the data host in ``download_data``. [#3403]
3232

33+
gaia
34+
^^^^
35+
36+
- New datalink DR4 retrieval type RESIDUAL_IMAGE. [#3489]
3337

3438
esa.hubble
3539
^^^^^^^^^^
@@ -52,11 +56,21 @@ mast
5256

5357
- Raise informative error if ``MastMissions`` query radius is too large. [#3447]
5458

59+
- Add ``batch_size`` parameter to ``MastMissions.get_product_list``, ``Observations.get_product_list``,
60+
and ``utils.resolve_object`` to allow controlling the number of items sent in each batch request to the server.
61+
This can help avoid timeouts or connection errors for large requests. [#3454]
62+
63+
- Separate requests for moving target cutouts in ``Tesscut`` to one per sector. [#3467]
64+
65+
- Improved robustness of PanSTARRS column metadata parsing. This prevents metadata-related query errors. [#3485]
66+
5567
jplspec
5668
^^^^^^^
5769

70+
- Refactored to use linelists.core. Added new ``get_molecule`` method [#3456]
5871
- Moved to linelists/. astroquery.jplspec is now deprecated in favor of astroquery.linelists.jplspec [#3455]
5972

73+
6074
linelists.jplspec
6175
^^^^^^^^^^^^^^^^^
6276

@@ -65,7 +79,13 @@ linelists.jplspec
6579
mpc
6680
^^^
6781

68-
- Fix bug in queries for interstellar objects with `MPC.get_observations` and enable queries for "dead" comets [#3474]
82+
- Fix bug in queries for interstellar objects with ``MPC.get_observations`` and enable queries for "dead" comets [#3474]
83+
84+
linelists
85+
^^^^^^^^^
86+
87+
- General tools for both CDMS/JPL moved to linelists.core [#3456]
88+
- Added jplspec, moved from its previous location (astroquery.jplspec to astroquery.linelists.jplspec) [#3455]
6989

7090
noirlab
7191
^^^^^^^

astroquery/alma/core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,8 +707,8 @@ def query_tap(self, query, *, maxrec=None, uploads=None):
707707
>>> uploads = {'tmptable': '/tmp/tmptable_def.xml'}
708708
>>> rslt = query_tap(self, query, maxrec=None, uploads=uploads)
709709
710-
Return
711-
------
710+
Returns
711+
-------
712712
result : `~pyvo.dal.TAPResults`
713713
TAP query result
714714

astroquery/esa/euclid/core.py

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,6 @@ def __get_schema_name(self, full_qualified_table_name):
269269
def launch_job(self, query, *, name=None, dump_to_file=False, output_file=None, output_format="csv", verbose=False,
270270
upload_resource=None, upload_table_name=None):
271271
"""
272-
Description
273-
-----------
274272
Launches a synchronous job
275273
276274
Parameters
@@ -315,8 +313,6 @@ def launch_job(self, query, *, name=None, dump_to_file=False, output_file=None,
315313
def launch_job_async(self, query, *, name=None, dump_to_file=False, output_file=None, output_format="csv",
316314
verbose=False, background=False, upload_resource=None, upload_table_name=None, autorun=True):
317315
"""
318-
Description
319-
-----------
320316
Launches an asynchronous job
321317
322318
Parameters
@@ -370,8 +366,6 @@ def launch_job_async(self, query, *, name=None, dump_to_file=False, output_file=
370366
def query_object(self, coordinate, *, radius=None, width=None, height=None,
371367
async_job=False, verbose=False, columns=None):
372368
"""
373-
Description
374-
-----------
375369
Searches for objects around a given position with the default catalog sascat_pvpr01.mer_final_cat_pvpr01
376370
377371
Parameters
@@ -510,8 +504,6 @@ def cone_search(self, coordinate, radius, *,
510504
verbose=False,
511505
columns=None):
512506
"""
513-
Description
514-
-----------
515507
Cone search for a given catalog and sky position, results sorted by distance
516508
517509
Parameters
@@ -605,8 +597,6 @@ def cone_search(self, coordinate, radius, *,
605597

606598
def login(self, *, user=None, password=None, credentials_file=None, verbose=False):
607599
"""
608-
Description
609-
-----------
610600
Performs a login
611601
612602
User and password can be used or a file that contains username and password
@@ -649,8 +639,6 @@ def login(self, *, user=None, password=None, credentials_file=None, verbose=Fals
649639

650640
def login_gui(self, verbose=False):
651641
"""
652-
Description
653-
-----------
654642
Performs a login using a GUI dialog
655643
656644
Parameters
@@ -690,8 +678,6 @@ def login_gui(self, verbose=False):
690678

691679
def logout(self, verbose=False):
692680
"""
693-
Description
694-
-----------
695681
Performs a logout
696682
697683
Parameters
@@ -743,8 +729,6 @@ def is_gz_file(filepath):
743729

744730
def get_status_messages(self, verbose=False):
745731
"""
746-
Description
747-
-----------
748732
Retrieve the messages to inform users about
749733
the status of Euclid TAP
750734
@@ -822,8 +806,6 @@ def __extract_file(output_file_full_path, output_dir, files):
822806
def get_observation_products(self, *, id=None, schema="sedm", product_type=None, product_subtype="STK",
823807
filter="VIS", output_file=None, verbose=False):
824808
"""
825-
Description
826-
-----------
827809
Downloads the products for a given EUCLID observation_id (observations) or tile_index (mosaics)
828810
For big files the download may require a long time
829811
@@ -892,9 +874,7 @@ def get_observation_products(self, *, id=None, schema="sedm", product_type=None,
892874

893875
def __get_tile_catalogue_list(self, *, tile_index, product_type, verbose=False):
894876
"""
895-
Description
896-
-----------
897-
Get the list of products of a given EUCLID tile_index (mosaics)
877+
Get the list of products of a given EUCLID tile_index (mosaics)
898878
899879
Parameters
900880
----------
@@ -1000,8 +980,6 @@ def __get_tile_catalogue_list(self, *, tile_index, product_type, verbose=False):
1000980

1001981
def get_product_list(self, *, observation_id=None, tile_index=None, product_type, verbose=False):
1002982
"""
1003-
Description
1004-
-----------
1005983
Get the list of products of a given EUCLID id searching by observation_id or tile_index.
1006984
1007985
Parameters
@@ -1203,8 +1181,6 @@ def get_product_list(self, *, observation_id=None, tile_index=None, product_type
12031181

12041182
def get_product(self, *, file_name=None, product_id=None, schema='sedm', output_file=None, verbose=False):
12051183
"""
1206-
Description
1207-
-----------
12081184
Downloads a product given its file name or product id
12091185
12101186
Parameters
@@ -1262,8 +1238,6 @@ def get_product(self, *, file_name=None, product_id=None, schema='sedm', output_
12621238
def get_cutout(self, *, file_path=None, instrument=None, id=None, coordinate, radius, output_file=None,
12631239
verbose=False):
12641240
"""
1265-
Description
1266-
-----------
12671241
Downloads a cutout given its file path, instrument and obs_id, and the cutout region
12681242
12691243
Parameters
@@ -1329,8 +1303,6 @@ def get_cutout(self, *, file_path=None, instrument=None, id=None, coordinate, ra
13291303

13301304
def get_spectrum(self, *, source_id, schema='sedm', retrieval_type="ALL", output_file=None, verbose=False):
13311305
"""
1332-
Description
1333-
-----------
13341306
Downloads a spectrum with datalink.
13351307
13361308
The spectrum associated with the source_id is downloaded as a compressed fits file, and the files it contains
@@ -1420,10 +1392,7 @@ def get_spectrum(self, *, source_id, schema='sedm', retrieval_type="ALL", output
14201392

14211393
def get_datalinks(self, ids, *, linking_parameter='SOURCE_ID', extra_options=None, verbose=False):
14221394
"""
1423-
Description
1424-
-----------
1425-
Gets datalinks associated to the provided identifiers.
1426-
TAP+ only
1395+
Gets datalinks associated to the provided identifiers (TAP+ only).
14271396
14281397
Parameters
14291398
----------

astroquery/gaia/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ class Conf(_config.ConfigNamespace):
4949
'EPOCH_FLAGS_NSS',
5050
'EPOCH_PARAMETERS_RVS_SINGLE',
5151
'EPOCH_PARAMETERS_RVS_DOUBLE',
52-
'EPOCH_FLAGS_VARI']
52+
'EPOCH_FLAGS_VARI',
53+
'RESIDUAL_IMAGE']
5354

5455
VALID_LINKING_PARAMETERS = {'SOURCE_ID', 'TRANSIT_ID', 'IMAGE_ID'}
5556

astroquery/gaia/core.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
196196
'EPOCH_ASTROMETRY_BRIGHT', 'MEAN_SPECTRUM_XP_GRAVLENS', 'EPOCH_FLAGS_NSS', 'EPOCH_PARAMETERS_RVS_SINGLE',
197197
'EPOCH_PARAMETERS_RVS_DOUBLE', 'EPOCH_FLAGS_VARI']. Note that for 'CROWDED_FIELD_IMAGE', only the format
198198
'fits' can be used, and its image, in the principal header, will not be available in the returned
199-
dictionary. Set 'output_file' to retrieve all data: image + tables.
199+
dictionary. Set 'output_file' to retrieve all data: image + tables. Note that for 'RESIDUAL_IMAGE',
200+
only the format 'fits' can be used. Since the fits files only contain images, the returned table will be
201+
empty. Therefore, set 'output_file' to save the files to get access to their content.
200202
linking_parameter : str, optional, default SOURCE_ID, valid values: SOURCE_ID, TRANSIT_ID, IMAGE_ID
201203
By default, all the identifiers are considered as source_id
202204
SOURCE_ID: the identifiers are considered as source_id

0 commit comments

Comments
 (0)