-
-
Notifications
You must be signed in to change notification settings - Fork 424
Enable TAP for ESO module #3141
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
Closed
Closed
Changes from 164 commits
Commits
Show all changes
168 commits
Select commit
Hold shift + click to select a range
322627c
tox.ini, setup.cfg: test only ESO subdirs
juanmcloaiza adf5b57
GitHub Workflows - run on develop branch
juanmcloaiza c7ae3f7
Delete this commit - message on __init__ EsoClass
juanmcloaiza d469be8
Switch to TAP list_surveys and list_instruments
juanmcloaiza 971c5d1
Define tap_url as static method
juanmcloaiza 06e3264
Deselect ALMA at query level - TEMPORAL SOLUTION
juanmcloaiza 974d218
Mark list_surveys as deprecated; define list_collections
juanmcloaiza 182ce0b
Add name of the new function to deprecation warning
juanmcloaiza 6092c34
Deprecate list_ and query_ _surveys in favor of _collections
juanmcloaiza 4f6c6fa
Replace 'survey' by 'collection' accross eso module
juanmcloaiza eafcae9
Make Pep8-compliant
juanmcloaiza 38590a9
Use astroquery deprecated decorator
juanmcloaiza 79843ad
Accept argument 'surveys=' when calling *_surveys() deprecated functions
juanmcloaiza 9ee58c7
Remove unused imports
juanmcloaiza 9a71607
query_surveys --> query_collections in test_eso.py
juanmcloaiza dea1443
Update CHANGES.rst
juanmcloaiza 6d34286
Add test_tap_url()
juanmcloaiza 88f51aa
Remove hard-coded queries iside user-exposed functions
juanmcloaiza 15866d0
Remove function _activate_form
juanmcloaiza 1cea70a
Develop py2adql function with tests
juanmcloaiza aead4c7
Handle coord1 and coord2 arguments in query_collections
juanmcloaiza 2a85df7
Remove intersects arg from py2adql
juanmcloaiza b436e90
Write TAP enabled query_collections; pass existing tests
juanmcloaiza d4b9f26
Remove intersects arg from py2adql test - not its responsibility
juanmcloaiza af2b503
Add ATLASGAL to SGRA_COLLECTIONS
juanmcloaiza 0fbef0c
Write test for func query_tap_service
juanmcloaiza fd79a3a
Define and use _query_tap_service
juanmcloaiza 5b8ab2c
fwd query_instrument and _collections to query_instrument_or_collection
juanmcloaiza 8e75791
Ignore DALOverflowWarning with more granularity
juanmcloaiza 63b0804
Remove unused code
juanmcloaiza 2e53c81
Take instrument or collection data from the corresponding table
juanmcloaiza 546ad4a
Ignore DALOverflowWarning on remote tests
juanmcloaiza e4272fb
Issue queries based on new QueryOnField class
juanmcloaiza 3903bbb
Remove unused function _query
juanmcloaiza f57c75c
Modify test_multicollection to something less arbitrary
juanmcloaiza 9b7193d
Make PEP8 linter happy
juanmcloaiza 3c2d561
Replace mutable default arguments by None
juanmcloaiza 776d0b2
Add type hints to query_instruments and query_collections
juanmcloaiza 9f4c60b
Rename *_list attributes; add return types
juanmcloaiza 12f0a41
Add return types
juanmcloaiza 0fbe75b
Refactor QueryOnField classes as dataclasses
juanmcloaiza 23db6b3
correctly pass the dataclass to query_* function
juanmcloaiza 14d05df
Annotate types of EsoClass.collections and instruments
juanmcloaiza 0b18556
Add type hints to py2adql
juanmcloaiza 6a9e377
Write utils function sanitize_val; Add top arg in py2adql
juanmcloaiza f85f16d
Write TAP version of query_main; sanitize constraints vals
juanmcloaiza 75a9e80
correct typo in query string
juanmcloaiza f9a62ac
Add test_main_SgrAstar
juanmcloaiza 3bf21b4
Row limit handled at query level. No filterwarnings needed
juanmcloaiza d1ae667
query_main is always against dbo.raw
juanmcloaiza 89a0bed
Add assert messages
juanmcloaiza 107a8b4
Make linter happy
juanmcloaiza ee94891
Add cache functionality to tap queries
juanmcloaiza c3c0eea
Try mimicking the old warning behaviour
juanmcloaiza 24a34c1
Provisional fix to apex query
juanmcloaiza c08e2a1
Use t1.values_equal(t2) for table equality
juanmcloaiza 44ac1cd
Test table equality via t1.values_equal(t2)
juanmcloaiza a0df527
Do not exclude ALMA from collection queries
juanmcloaiza 55eb77c
Rename request --> table in function from_cache(...)
juanmcloaiza 786a78c
Remove unused data files
juanmcloaiza 4442bb4
Update monkeypatches in test_eso.py
juanmcloaiza 553afb5
Add data needed by monkeypatch
juanmcloaiza 63426ed
Cleanup test_eso.py
juanmcloaiza 17ad13f
Make linter heppier
juanmcloaiza d7b7e85
Make the linter happier
juanmcloaiza d6b5841
Add docstrings to utils.py
juanmcloaiza c715f25
Make linter happy
juanmcloaiza 6f2ceba
Make linter happy
juanmcloaiza ba560bb
Fix E502 the backslash is redundant between brackets
juanmcloaiza d294c09
Add changelog; fix docs title underline
juanmcloaiza 67de1cf
Raise NotImplementedError in query_apex_quicklooks
juanmcloaiza b79b07a
Write monkeypatch offline test for apex_quicklooks
juanmcloaiza 846dd70
Write monkeypatch offline test for apex_quicklooks
juanmcloaiza 2b3fc91
Addressed some TODOs
juanmcloaiza 7411d29
Bugfix: The print_help message is truncated
juanmcloaiza b6705d3
put back except Exception
juanmcloaiza ebc6904
Deprecate help arg in favour of print_help
juanmcloaiza 99b4459
retrieve_data handles datasets as astropy.table.column
juanmcloaiza b1e4641
(box, coord1, coord2) --> (ra, dec, radius)
juanmcloaiza c82e71d
Pep8
juanmcloaiza 14aa320
Take tap_url_dev in config from env vars
juanmcloaiza be9c037
Rewrite query functions; query the ISts
juanmcloaiza e587210
clean up log functions
juanmcloaiza 3dae1c9
http --> https
juanmcloaiza 3969eea
Read TAP_URL from environment var
juanmcloaiza 0ba1688
Avail: 'top', 'count_only', 'maxrec', 'MaxResultsWarning'
juanmcloaiza 3021671
Improve MaxResultsWarning message
juanmcloaiza e6688da
Add tests for ROW_LIMIT and top
juanmcloaiza c17c413
ignore DALOverflowWarning in setup.cfg
juanmcloaiza a0ca76a
Ignore DALOverflowWarning in tests
juanmcloaiza c3281bb
Correct offline tests monkeypatch keys
juanmcloaiza 1b211fd
Add provisional tests placeholders
juanmcloaiza 3e1759f
Add test_tap_url
juanmcloaiza 3d89851
write test_request_file()
juanmcloaiza 0581bf7
Add tests for cache
juanmcloaiza 416c5d9
add test data file
juanmcloaiza 3d70229
Add test file
juanmcloaiza a52f014
Add tests for list instruments and collections
juanmcloaiza 85ab283
Add tests for list instruments and collections
juanmcloaiza 8d4a2d2
Add test data for list_ functions
juanmcloaiza d1e4bb7
Remove empty tests
juanmcloaiza d2ce5de
pep8
juanmcloaiza e25a5a6
Remove cache from query_ functions
juanmcloaiza 9397d52
read ESO_TAP_URL from env var; otherwise use the config one
juanmcloaiza cd2d316
Define unlimited_max_rec decorator
juanmcloaiza ae46744
Make test_tap_url() consistent
juanmcloaiza b6553bc
Avoid defining msg string before each log message
juanmcloaiza ffe8dd7
Remove apex_quicklooks test
juanmcloaiza 1ac3b3b
Clean-up code; increase test coverage
juanmcloaiza 190316e
Refactor query_tap_service; define maxrec getter+setter
juanmcloaiza 9a071f8
Add test_maxrec
juanmcloaiza 342b4fe
Refactor and test try_download_pyvo_table
juanmcloaiza 358ca42
Delegate warnings to its own method; write test
juanmcloaiza 97cff84
pep8
juanmcloaiza 2e199b2
Add test case to py2adql
juanmcloaiza 49f35c9
add alpaca to instrument list
juanmcloaiza 899733a
Make non-user facing functions private
juanmcloaiza 1934dfe
Make non-user facing functions private
juanmcloaiza 54965a6
helpmessage: add xtype, descr, units, nrows
juanmcloaiza 696b1ba
utils.py small refactor
juanmcloaiza 68546ab
Clean tests code
juanmcloaiza da9e639
Allow returning only the query string without issuing the query
juanmcloaiza 0d1e51f
Bugfix: cone search params ignored when no other filters
juanmcloaiza 2b5cc1b
Update test_eso_remote.py
juanmcloaiza 10292d7
Update test_eso_remote.py
juanmcloaiza 2fac359
Allow authenticated queries; avoid saving password in plain text
juanmcloaiza 9229b70
Rename collections --> surveys
juanmcloaiza 94d2e39
pep-8
juanmcloaiza 17d9c47
Increase default maxrec to 1000
juanmcloaiza 84b12e8
put back help, open_form, filter_columns arguments
juanmcloaiza a55d2cd
pep-8
juanmcloaiza a007031
doc: revert query_ and list_ _collections to _surveys
juanmcloaiza 8d0aacd
Add docstrings to list_instruments and list_surveys
juanmcloaiza 8734ffd
Update query_surveys docstring
juanmcloaiza ee6134e
Update docstring: query_surveys
juanmcloaiza bae22f4
Update docstrings for query_main and query_instrument
juanmcloaiza 16a0e99
Make tap_url method private
juanmcloaiza 7483604
Add docstring to query_tap_service
juanmcloaiza 334c80e
Update docstring query_tap_service
juanmcloaiza 747060d
Remove description col from table help output
juanmcloaiza bab1dc7
Update ESO docs
juanmcloaiza b68e3e2
Update CHANGES.rst
juanmcloaiza fa4ba95
Implement query_apex_quicklooks
juanmcloaiza 6a585c9
Remove args from apex_quicklooks - ra, dec, radius
juanmcloaiza 920fa42
Rename args ra, dec, radius --> cone_[xxx]
juanmcloaiza dbeed4d
Update error message on query fails
juanmcloaiza a71c5c4
fix: cone search ignored when cone_ra=0
juanmcloaiza 5a45882
Check type in maxrec setter
juanmcloaiza 6df2c21
Reorder columns before returning results
juanmcloaiza ba95272
Reorder columns before returning the table
juanmcloaiza d23b30f
pep8
juanmcloaiza 7a7cf43
Allow TAP operators on column_filters (#5)
juanmcloaiza 6ea7b1f
Add missing blank line to CHANGES.rst
juanmcloaiza 296e9a4
Add 'not in' and 'not like' to supported TAP operators
juanmcloaiza 4c9ce99
Update documentation and docstrings
juanmcloaiza feba734
Update documentation
juanmcloaiza 3f64344
docs: add warning and column_filters fix
juanmcloaiza c732bae
Fix: 'instrument' interpreted as filter 'in strument'
juanmcloaiza 08c7b65
pep8
juanmcloaiza 0929318
Fix: 'instrument' interpreted as filter 'in strument'
juanmcloaiza 3aa745e
Merge branch 'astropy:main' into develop
juanmcloaiza 0242cb0
Reimplement ESO querying functions to use TAP / ADQL (#2)
juanmcloaiza 58d628e
Fix typo in ValueError message
juanmcloaiza 6b86480
Merge branch 'develop' into TAP
juanmcloaiza d53349a
Revert changes in workflows yml files
juanmcloaiza e5bad76
Restore setup.cfg
juanmcloaiza 4b7f86b
restore tox.ini
juanmcloaiza 6d4ec59
Format docstrings in NumPy style
juanmcloaiza File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't add any changes to the CI or other config files, and remove all these changes from the history.