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

Improve subclassing attrs.Time and JSOC _can_handle_query #3874

Merged
merged 3 commits into from Mar 11, 2020

Conversation

Cadair
Copy link
Member

@Cadair Cadair commented Mar 9, 2020

This is a couple of small fixes from #3770

The first change is motivated by the DKIST client in DKISTDC/dkist#73 where I am subclassing a.Time for a different purpose. Changing our checks to be for type rather than instance means that you can combine two different subclasses of Time in one query without issue.

The other is to make sure that the JSOC client can only handle queries if a.jsoc.Series is provided, otherwise queries with just a.Wavelength or a.Time match the JSOC but then .search errors.

@Cadair Cadair requested a review from a team as a code owner March 9, 2020 09:36
@pep8speaks
Copy link

pep8speaks commented Mar 9, 2020

Hello @Cadair! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

Line 9:101: E501 line too long (109 > 100 characters)

Comment last updated at 2020-03-09 15:35:10 UTC

@Cadair Cadair added Needs Review Needs reviews before merge net Affects the net submodule No Changelog Entry Needed labels Mar 9, 2020
@Cadair Cadair added this to the 2.0 milestone Mar 9, 2020
@dstansby
Copy link
Member

dstansby commented Mar 9, 2020

Looks like this is good to go pending a rebase

@Cadair
Copy link
Member Author

Cadair commented Mar 9, 2020

rebased.

@nabobalis nabobalis merged commit c10cc5d into sunpy:master Mar 11, 2020
@Cadair Cadair deleted the small_fido branch March 11, 2020 17:14
Comment on lines +872 to +875
if not required.issubset(query_attrs) or not query_attrs.issubset(all_attrs):
return False

return True
Copy link
Member

@dpshelio dpshelio Mar 11, 2020

Choose a reason for hiding this comment

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

Suggested change
if not required.issubset(query_attrs) or not query_attrs.issubset(all_attrs):
return False
return True
return required.issubset(query_attrs) and query_attrs.issubset(all_attrs)

@dstansby dstansby removed the Needs Review Needs reviews before merge label Jan 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
net Affects the net submodule No Changelog Entry Needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants