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

Feature simbad query tap #2856

Merged
merged 23 commits into from
Jan 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
eb79ed7
FEAT: Add a query_tap method to SimbadClass
ManonMarchand Oct 11, 2023
e6580a8
docs: reorganize sections in simbad docs
ManonMarchand Oct 12, 2023
ab7c7d2
docs: add query TAP section
ManonMarchand Oct 12, 2023
f003c5d
feat: add helper functions to explore SIMBAD tables
ManonMarchand Oct 19, 2023
fca6d15
docs: add documentation for query_tap and its helper methods
ManonMarchand Oct 19, 2023
14fe47d
test: add tests for _adql_parameter and _adql_name
ManonMarchand Oct 19, 2023
9076760
docs: add changelog entry
ManonMarchand Oct 19, 2023
6d31b1f
test: add try/except on pyvo version for DALOverflowWarning
ManonMarchand Oct 20, 2023
564517a
fix: exchange order of BaseVOQuery and SimbadBaseQuery
ManonMarchand Nov 8, 2023
96777c1
refactor: rename tables and columns into list_tables and list_columns
ManonMarchand Nov 8, 2023
67aab66
style: make optional kwargs kwarg only
ManonMarchand Nov 9, 2023
cc3aeab
docs: remove links to issues, rephrase adql example
ManonMarchand Nov 9, 2023
21ccd2b
docs: remove doctest ignore on first TAP example
ManonMarchand Nov 9, 2023
744262f
feat: add caching to query_tap and hardlimit
ManonMarchand Nov 10, 2023
821aec7
docs: add an example of Simbad.query_tap with an uploaded table
ManonMarchand Nov 10, 2023
8ff6d73
fix: remove use of functools.cache_property for python 3.7 support
ManonMarchand Nov 10, 2023
4983ab6
fix: switch simbad.mirror list into simbad.conf.server_list
ManonMarchand Nov 13, 2023
79d4010
docs: fix english issues
ManonMarchand Nov 22, 2023
56c8e1d
docs: increase font size in simbad graph
ManonMarchand Nov 22, 2023
b99ad4c
fix: updated datatype in doctest outputs
ManonMarchand Jan 26, 2024
d2b2bc4
edit intersphinx links
ManonMarchand Jan 26, 2024
1304824
fix: simplify IN statement
ManonMarchand Jan 26, 2024
ccf93cb
fix: remove unused adql_name function
ManonMarchand Jan 26, 2024
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
Prev Previous commit
Next Next commit
fix: remove use of functools.cache_property for python 3.7 support
ManonMarchand committed Jan 26, 2024

Verified

This commit was signed with the committer’s verified signature.
ManonMarchand Manon Marchand
commit 8ff6d7368adcd01286f52978a47e135cfad355af
9 changes: 6 additions & 3 deletions astroquery/simbad/core.py
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
import os
from collections import namedtuple
from io import BytesIO
from functools import lru_cache, cached_property
from functools import lru_cache
import warnings
import astropy.units as u
from astropy.utils import isiterable
@@ -372,13 +372,16 @@ def tap(self):
self._tap = TAPService(baseurl=tap_url, session=self._session)
return self._tap

@cached_property
@property
@lru_cache(1)
def hardlimit(self):
"""The maximum number of lines for Simbad's output.

This property is cached to avoid calls to simbad's capability
page each time `query_tap` is called.
webpage each time the getter is called.
"""
# replace stack of property and lru_cache by functools.cache_property when
# astroquery drops python 3.7 support
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh, reminder that we should indeed drop support.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I keep the comment to help when the support will be dropped, or is it noise?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please do keep comments like these. Whenever we drop support I usually go around grep for things like 3.7, etc, so will more likely to find this for cleanup because of the comment.

return self.tap.hardlimit

def list_wildcards(self):