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

Fixed formatter in IntervalQueryParam #225

Merged
merged 2 commits into from
Apr 23, 2020
Merged

Fixed formatter in IntervalQueryParam #225

merged 2 commits into from
Apr 23, 2020

Conversation

andamian
Copy link
Contributor

@andamian andamian added the bug label Apr 21, 2020
@andamian andamian added this to the v1.1 milestone Apr 21, 2020
@andamian andamian requested review from funbaker and cbanek April 21, 2020 22:17
@andamian andamian self-assigned this Apr 21, 2020
@andamian andamian mentioned this pull request Apr 21, 2020
Merged
cbanek
cbanek approved these changes Apr 21, 2020
View reviewed changes
Copy link
Contributor

@cbanek cbanek left a comment

Choose a reason for hiding this comment

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

Looking good to me!

@codecov
Copy link

codecov bot commented Apr 23, 2020 •
edited
Loading

Codecov Report

Merging #225 into master will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #225      +/-   ##
==========================================
+ Coverage   72.19%   72.20%   +0.01%     
==========================================
  Files          42       42              
  Lines        4478     4480       +2     
==========================================
+ Hits         3233     3235       +2     
  Misses       1245     1245
Impacted Files Coverage Δ
pyvo/dal/params.py 86.40% <100.00%> (+0.10%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9d527e1...4c97532. Read the comment docs.

@funbaker
Copy link
Contributor

Is there a reason for a merge instead of a rebase?

@andamian
Copy link
Contributor Author

Is there a reason for a merge instead of a rebase?

Convenience. Is there an advantage for rebase? At the end we squash and merge to master.

@funbaker
Copy link
Contributor

Is there a reason for a merge instead of a rebase?

Convenience. Is there an advantage for rebase? At the end we squash and merge to master.

https://www.atlassian.com/git/tutorials/merging-vs-rebasing

@andamian andamian merged commit 8d1567f into astropy:master Apr 23, 2020
@andamian andamian deleted the sia2_interval_fix branch April 23, 2020 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@funbaker funbaker funbaker approved these changes

@cbanek cbanek cbanek approved these changes

Assignees

@andamian andamian

Labels
bug no-changelog-entry-needed
Projects
None yet
Milestone
v1.1
Development

Successfully merging this pull request may close these issues.
3 participants
@andamian @funbaker @cbanek