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

BUG: alma fixes for list of keywords, fixes #2094 #2457

Merged
merged 5 commits into from Jul 11, 2022
Merged

BUG: alma fixes for list of keywords, fixes #2094 #2457

merged 5 commits into from Jul 11, 2022

Conversation

at88mph
Copy link
Contributor

@at88mph at88mph commented Jul 4, 2022 •
edited by bsipocz

ADQL not handling lists of strings properly. Existing OR logic was used instead of introducing IN clause.

fixes #2094

@codecov
Copy link

codecov bot commented Jul 4, 2022 •
edited

Codecov Report

Merging #2457 (9fe00d2) into main (26618d1) will increase coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head 9fe00d2 differs from pull request most recent head 11b1bb8. Consider uploading reports for the commit 11b1bb8 to get more accurate results

@@           Coverage Diff           @@
##             main    #2457   +/-   ##
=======================================
  Coverage   62.92%   62.92%           
=======================================
  Files         133      133           
  Lines       17300    17302    +2     
=======================================
+ Hits        10886    10888    +2     
  Misses       6414     6414
Impacted Files Coverage Δ
astroquery/alma/tapsql.py 94.41% <100.00%> (+0.06%) ⬆️

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@at88mph
Copy link
Contributor Author

at88mph commented Jul 5, 2022

The failed test_timer.py in 3.8 runs fine locally. Does this need to be kicked and rerun or is it a genuine failure?

@bsipocz bsipocz added this to the v0.4.7 milestone Jul 9, 2022
@bsipocz bsipocz mentioned this pull request Jul 9, 2022
Closed
@bsipocz bsipocz changed the title Fixes #2094 BUG: alma fixes for list of keywords, fixes #2094 Jul 9, 2022
bsipocz
bsipocz approved these changes Jul 9, 2022
View reviewed changes
Copy link
Member

@bsipocz bsipocz left a comment

Choose a reason for hiding this comment

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

Please add a changelog entry, and maybe remove the last commit that has the goal of re-triggering CI (that unrelated test is somewhat flaky, I'll try to cook up a solution so it will show up less often as a false failure in the future)

astroquery/alma/tests/test_alma.py
@@ -173,6 +173,15 @@ def test_gen_str_sql():
"(proposal_id LIKE '2012.%' OR proposal_id LIKE '2013._3%')"


def test_gen_array_sql():
common_select = "select * from ivoa.obscore WHERE "
Copy link
Member

Choose a reason for hiding this comment

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

extreme nitpick: maybe add a comment that this tests the regression from #2094?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, thanks @bsipocz . Will the CHANGES.rst entry fall under the 0.4.7 heading?

Copy link
Member

Choose a reason for hiding this comment

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

yes, please

@bsipocz
Copy link
Member

bsipocz commented Jul 11, 2022

We generally avoid merge commits for the purpose of updating a branch, so I'll be removing that one prior merging the PR. Otherwise, it all looks good.

@at88mph
Copy link
Contributor Author

at88mph commented Jul 11, 2022

Apologies. Is that documented somewhere and I missed it?

@bsipocz
Copy link
Member

bsipocz commented Jul 11, 2022 •
edited

very good point, it's in the astropy dev docs at a few places, but it's very much hidden into the weeds, so I suppose we better do a section for it in astroquery itself.

opened #2462 to keep track of this

bsipocz
bsipocz reviewed Jul 11, 2022
View reviewed changes
CHANGES.rst
alma
^^^^

- Fixed a regression to handle arrays of string input for the ``query`` methods. [#2094]
Copy link
Member

Choose a reason for hiding this comment

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

the number in the changelog should point to the number of the PR. I'm fixing this directly. (and this should be pulled into the dev docs highlights, too as it's also one deep in the weeds)

@bsipocz
Copy link
Member

bsipocz commented Jul 11, 2022

Tests have passed here already, I've only removed the last merge commit, so I'm going ahead and merge the PR now.

Thanks @at88mph!

@bsipocz bsipocz merged commit f2d0bd2 into astropy:main Jul 11, 2022
@at88mph at88mph deleted the adql-array-arg-bugfix branch July 28, 2022 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsipocz bsipocz bsipocz approved these changes

Assignees
No one assigned
Labels
alma bug
Projects
None yet
Milestone
v0.4.7
Development

Successfully merging this pull request may close these issues.

ALMA: Cannot select multiple science keywords
2 participants
@at88mph @bsipocz