Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GAIA: Due to the new tap 9.8.0, functions return uncompressed FITS/ECSV files #2983

Merged
merged 7 commits into from
Apr 30, 2024
Merged

GAIA: Due to the new tap 9.8.0, functions return uncompressed FITS/ECSV files #2983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
baa9278
GAIAPCR-1317 change format to votable in the function load_data
Apr 5, 2024
8a8f728
GAIAPCR-1317 change the values of the tuple format_with_results_compr…
Apr 5, 2024
f2c538e
GAIAPCR-1317 change the values of the tuple format_with_results_compr…
Apr 5, 2024
b02781e
GAIAPCR-1317 Update documentation of the return type for the function…
Apr 6, 2024
1f7b4c0
GAIAPCR-1317 Update the changelog file
Apr 6, 2024
ad288d1
GAIAPCR-1317 Update PR number
Apr 6, 2024
6599113
GAIAPCR-1317 Update function load_data_monkeypatched du to the latest…
Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ gaia
- Include table size in the class TapTableMeta returned by the functions load_tables and load_table, in the class Tap.
[#2970]

- For the functions that return files in FITS/ECSV format, the files are now provided as uncompressed files.
[#2983]


jplhorizons
^^^^^^^^^^^
Expand Down
13 changes: 6 additions & 7 deletions astroquery/gaia/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ def logout(self, *, verbose=False):

def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retrieval_type="ALL",
linking_parameter='SOURCE_ID', valid_data=False, band=None, avoid_datatype_check=False,
format="votable_gzip",
output_file=None, overwrite_output_file=False, verbose=False):
format="votable", output_file=None, overwrite_output_file=False, verbose=False):
"""Loads the specified table
TAP+ only

Expand Down Expand Up @@ -215,8 +214,8 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
avoid_datatype_check: boolean, optional, default False.
By default, this value will be set to False. If it is set to 'true'
the Datalink items tags will not be checked.
format : str, optional, default 'votable_gzip'
loading format. Other available formats are 'votable', 'csv', 'ecsv','votable_plain' and 'fits'
format : str, optional, default 'votable'
loading format. Other available formats are 'csv', 'ecsv','votable_plain' and 'fits'
output_file : string or pathlib.PosixPath, optional, default None
file where the results are saved.
If it is not provided, the http response contents are returned.
Expand All @@ -227,7 +226,7 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr

Returns
-------
A table object
A dictionary where the keys are the file names and its value is a list of astropy.table.table.Table objects
"""
now = datetime.now(timezone.utc)
now_formatted = now.strftime("%Y%m%d_%H%M%S")
Expand Down Expand Up @@ -975,7 +974,7 @@ def launch_job(self, query, *, name=None, output_file=None,
dump_to_file=dump_to_file,
upload_resource=upload_resource,
upload_table_name=upload_table_name,
format_with_results_compressed=('votable_gzip', 'fits', 'ecsv'))
format_with_results_compressed=('votable_gzip',))

def launch_job_async(self, query, *, name=None, output_file=None,
output_format="votable_gzip", verbose=False,
Expand Down Expand Up @@ -1028,7 +1027,7 @@ def launch_job_async(self, query, *, name=None, output_file=None,
upload_resource=upload_resource,
upload_table_name=upload_table_name,
autorun=autorun,
format_with_results_compressed=('votable_gzip', 'fits', 'ecsv'))
format_with_results_compressed=('votable_gzip',))

def get_status_messages(self):
"""Retrieve the messages to inform users about
Expand Down