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.

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

Enable TAP for ESO module #3141

Draft
wants to merge 128 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 115 commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
6f6b238
Delete this commit - message on __init__ EsoClass
juanmcloaiza Feb 4, 2025
5b92a27
Switch to TAP list_surveys and list_instruments
juanmcloaiza Nov 27, 2024
b7171c4
Define tap_url as static method
juanmcloaiza Nov 27, 2024
398e5d8
Deselect ALMA at query level - TEMPORAL SOLUTION
juanmcloaiza Nov 27, 2024
37e517a
Mark list_surveys as deprecated; define list_collections
juanmcloaiza Nov 27, 2024
3aaed5d
Add name of the new function to deprecation warning
juanmcloaiza Nov 27, 2024
2ad267c
Deprecate list_ and query_ _surveys in favor of _collections
juanmcloaiza Nov 27, 2024
cc8d8b9
Replace 'survey' by 'collection' accross eso module
juanmcloaiza Nov 28, 2024
2046c63
Make Pep8-compliant
juanmcloaiza Nov 29, 2024
67fb26a
Use astroquery deprecated decorator
juanmcloaiza Nov 29, 2024
4427359
Accept argument 'surveys=' when calling *_surveys() deprecated functions
juanmcloaiza Nov 29, 2024
f414cde
Remove unused imports
juanmcloaiza Nov 29, 2024
3f6306d
query_surveys --> query_collections in test_eso.py
juanmcloaiza Nov 29, 2024
72ec94f
Update CHANGES.rst
juanmcloaiza Nov 29, 2024
ead4534
Add test_tap_url()
juanmcloaiza Nov 29, 2024
c2442b8
Remove hard-coded queries iside user-exposed functions
juanmcloaiza Dec 2, 2024
e37c28f
Remove function _activate_form
juanmcloaiza Dec 2, 2024
a2ea3fd
Develop py2adql function with tests
juanmcloaiza Dec 3, 2024
ab13538
Handle coord1 and coord2 arguments in query_collections
juanmcloaiza Dec 4, 2024
e980a24
Remove intersects arg from py2adql
juanmcloaiza Dec 4, 2024
09f2865
Write TAP enabled query_collections; pass existing tests
juanmcloaiza Dec 5, 2024
0fcd027
Remove intersects arg from py2adql test - not its responsibility
juanmcloaiza Dec 5, 2024
4b272e5
Add ATLASGAL to SGRA_COLLECTIONS
juanmcloaiza Dec 5, 2024
f2607c1
Ignore DALOverflowWarning thrown on truncated long query results
juanmcloaiza Dec 5, 2024
2d67d3e
Write test for func query_tap_service
juanmcloaiza Dec 5, 2024
50692bd
Define and use _query_tap_service
juanmcloaiza Dec 5, 2024
06b2199
fwd query_instrument and _collections to query_instrument_or_collection
juanmcloaiza Dec 5, 2024
fcfd76d
Ignore DALOverflowWarning with more granularity
juanmcloaiza Dec 5, 2024
123ce44
Remove unused code
juanmcloaiza Dec 5, 2024
c71e0e0
Take instrument or collection data from the corresponding table
juanmcloaiza Dec 6, 2024
0f2887c
Ignore DALOverflowWarning on remote tests
juanmcloaiza Dec 6, 2024
ee409a5
Issue queries based on new QueryOnField class
juanmcloaiza Dec 6, 2024
c584b2d
Remove unused function _query
juanmcloaiza Dec 9, 2024
423c86d
Modify test_multicollection to something less arbitrary
juanmcloaiza Dec 9, 2024
1a8ca60
Make PEP8 linter happy
juanmcloaiza Dec 9, 2024
e71cb85
Replace mutable default arguments by None
juanmcloaiza Dec 11, 2024
7c6e74f
Add type hints to query_instruments and query_collections
juanmcloaiza Dec 11, 2024
ad3e29e
Rename *_list attributes; add return types
juanmcloaiza Dec 11, 2024
9f5d7ea
Add return types
juanmcloaiza Dec 11, 2024
2c11f2d
Refactor QueryOnField classes as dataclasses
juanmcloaiza Dec 11, 2024
715f4fb
correctly pass the dataclass to query_* function
juanmcloaiza Dec 11, 2024
e4e659c
Annotate types of EsoClass.collections and instruments
juanmcloaiza Dec 11, 2024
a654258
Add type hints to py2adql
juanmcloaiza Dec 11, 2024
e46a8a9
Write utils function sanitize_val; Add top arg in py2adql
juanmcloaiza Dec 11, 2024
4b2d1f0
Write TAP version of query_main; sanitize constraints vals
juanmcloaiza Dec 11, 2024
44da8a9
correct typo in query string
juanmcloaiza Dec 12, 2024
ccf51ca
Add test_main_SgrAstar
juanmcloaiza Dec 12, 2024
ca79da2
Row limit handled at query level. No filterwarnings needed
juanmcloaiza Dec 12, 2024
e7a4826
query_main is always against dbo.raw
juanmcloaiza Dec 12, 2024
1c953e8
Add assert messages
juanmcloaiza Dec 12, 2024
22c7ccd
Make linter happy
juanmcloaiza Dec 12, 2024
b9d58a7
Add cache functionality to tap queries
juanmcloaiza Dec 13, 2024
847f58e
Try mimicking the old warning behaviour
juanmcloaiza Dec 13, 2024
10fd246
Provisional fix to apex query
juanmcloaiza Dec 13, 2024
b86ac10
Use t1.values_equal(t2) for table equality
juanmcloaiza Dec 13, 2024
07087cc
Test table equality via t1.values_equal(t2)
juanmcloaiza Dec 16, 2024
5bb91d7
Do not exclude ALMA from collection queries
juanmcloaiza Dec 16, 2024
ca4a2b8
Rename request --> table in function from_cache(...)
juanmcloaiza Jan 16, 2025
47a4bba
Remove unused data files
juanmcloaiza Jan 17, 2025
9d6c995
Update monkeypatches in test_eso.py
juanmcloaiza Jan 17, 2025
ddd552f
Add data needed by monkeypatch
juanmcloaiza Jan 17, 2025
db19c89
Cleanup test_eso.py
juanmcloaiza Jan 17, 2025
44ada97
Make linter heppier
juanmcloaiza Jan 17, 2025
01a1dd9
Make the linter happier
juanmcloaiza Jan 17, 2025
f26a2f8
Add docstrings to utils.py
juanmcloaiza Jan 17, 2025
cb4010b
Make linter happy
juanmcloaiza Jan 17, 2025
b9d75f1
Make linter happy
juanmcloaiza Jan 17, 2025
b368540
Fix E502 the backslash is redundant between brackets
juanmcloaiza Jan 17, 2025
be08c0d
Add changelog; fix docs title underline
juanmcloaiza Jan 17, 2025
bf1f053
Raise NotImplementedError in query_apex_quicklooks
juanmcloaiza Jan 17, 2025
fcaa55f
Write monkeypatch offline test for apex_quicklooks
juanmcloaiza Jan 17, 2025
78bf314
Write monkeypatch offline test for apex_quicklooks
juanmcloaiza Jan 17, 2025
586b30b
Addressed some TODOs
juanmcloaiza Jan 17, 2025
bdb9901
Bugfix: The print_help message is truncated
juanmcloaiza Jan 31, 2025
87db27b
put back except Exception
juanmcloaiza Jan 31, 2025
6e8dfc3
Deprecate help arg in favour of print_help
juanmcloaiza Feb 4, 2025
27f8b04
retrieve_data handles datasets as astropy.table.column
juanmcloaiza Feb 5, 2025
c66d6fd
(box, coord1, coord2) --> (ra, dec, radius)
juanmcloaiza Feb 5, 2025
c6469b8
Pep8
juanmcloaiza Feb 5, 2025
e8adc4a
Take tap_url_dev in config from env vars
juanmcloaiza Feb 5, 2025
6849dd9
Rewrite query functions; query the ISts
juanmcloaiza Feb 7, 2025
513135b
clean up log functions
juanmcloaiza Feb 7, 2025
0d2a717
http --> https
juanmcloaiza Feb 7, 2025
e5fa8f6
Read TAP_URL from environment var
juanmcloaiza Feb 7, 2025
d0e0a82
Avail: 'top', 'count_only', 'maxrec', 'MaxResultsWarning'
juanmcloaiza Feb 12, 2025
eae70f7
Improve MaxResultsWarning message
juanmcloaiza Feb 12, 2025
c449fb2
Add tests for ROW_LIMIT and top
juanmcloaiza Feb 12, 2025
94c2b38
ignore DALOverflowWarning in setup.cfg
juanmcloaiza Feb 13, 2025
71d4681
Ignore DALOverflowWarning in tests
juanmcloaiza Feb 13, 2025
965d540
Correct offline tests monkeypatch keys
juanmcloaiza Feb 13, 2025
59db07d
Add provisional tests placeholders
juanmcloaiza Feb 13, 2025
fdeb177
Add test_tap_url
juanmcloaiza Feb 13, 2025
f94a6b6
write test_request_file()
juanmcloaiza Feb 13, 2025
8953ee1
Add tests for cache
juanmcloaiza Feb 13, 2025
fb31479
add test data file
juanmcloaiza Feb 13, 2025
42e82be
Add test file
juanmcloaiza Feb 13, 2025
4d8f504
Add tests for list instruments and collections
juanmcloaiza Feb 13, 2025
b53ca42
Add tests for list instruments and collections
juanmcloaiza Feb 13, 2025
4a0d74a
Add test data for list_ functions
juanmcloaiza Feb 13, 2025
d96836c
Remove empty tests
juanmcloaiza Feb 14, 2025
a59333d
pep8
juanmcloaiza Feb 14, 2025
b3a7578
Remove cache from query_ functions
juanmcloaiza Feb 26, 2025
afe3e3a
read ESO_TAP_URL from env var; otherwise use the config one
juanmcloaiza Feb 26, 2025
0bfc7af
Define unlimited_max_rec decorator
juanmcloaiza Feb 26, 2025
30f06a4
Make test_tap_url() consistent
juanmcloaiza Feb 26, 2025
1fc06cf
Avoid defining msg string before each log message
juanmcloaiza Feb 27, 2025
b6e5c79
Remove apex_quicklooks test
juanmcloaiza Feb 27, 2025
5bb36b4
Clean-up code; increase test coverage
juanmcloaiza Feb 27, 2025
11319ec
Refactor query_tap_service; define maxrec getter+setter
juanmcloaiza Feb 27, 2025
2479bd3
Add test_maxrec
juanmcloaiza Feb 27, 2025
753dfcb
Refactor and test try_download_pyvo_table
juanmcloaiza Feb 28, 2025
1714e78
Delegate warnings to its own method; write test
juanmcloaiza Feb 28, 2025
0eea2b4
pep8
juanmcloaiza Feb 28, 2025
82fdc9b
Add test case to py2adql
juanmcloaiza Feb 28, 2025
5da9780
add alpaca to instrument list
juanmcloaiza Mar 3, 2025
ce21169
Make non-user facing functions private
juanmcloaiza Mar 12, 2025
b65b8b0
Make non-user facing functions private
juanmcloaiza Mar 12, 2025
e12e497
helpmessage: add xtype, descr, units, nrows
juanmcloaiza Mar 14, 2025
a59e005
utils.py small refactor
juanmcloaiza Mar 14, 2025
7c31cb7
Clean tests code
juanmcloaiza Mar 14, 2025
d7fd9b8
Allow returning only the query string without issuing the query
juanmcloaiza Mar 14, 2025
2c2d8a3
Bugfix: cone search params ignored when no other filters
juanmcloaiza Mar 14, 2025
16888fd
Update test_eso_remote.py
juanmcloaiza Mar 14, 2025
2890867
Update test_eso_remote.py
juanmcloaiza Mar 14, 2025
e0bfc14
Allow authenticated queries; avoid saving password in plain text
juanmcloaiza Mar 17, 2025
75b0082
Rename collections --> surveys
juanmcloaiza Mar 26, 2025
55e9941
pep-8
juanmcloaiza Mar 26, 2025
44db05a
Increase default maxrec to 1000
juanmcloaiza Mar 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,13 @@ esasky

- Added support for eROSITA downloads. [#3111]

eso
^^^

- Deprecate functions ``list_surveys`` and ``query_surveys`` in favor of ``list_collections`` and ``query_collections``. [#3138]

- Use TAP backend instead of WDB. [#3141]

gaia
^^^^

Expand Down
6 changes: 3 additions & 3 deletions astroquery/eso/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ class Conf(_config.ConfigNamespace):
username = _config.ConfigItem(
"",
'Optional default username for ESO archive.')
query_instrument_url = _config.ConfigItem(
"http://archive.eso.org/wdb/wdb/eso",
'Root query URL for main and instrument queries.')
tap_url = _config.ConfigItem(
"https://archive.eso.org/tap_obs",
'URL for TAP queries.')


conf = Conf()
Expand Down
Loading
Loading