Skip to content

Move timer functions from astropy - #1508

Merged
bsipocz merged 2 commits into
astropy:masterfrom
pllim:add-timer
Oct 10, 2019
Merged

bsipocz merged 2 commits into
astropy:masterfrom
pllim:add-timer

Conversation

@pllim

@pllim pllim commented Jul 22, 2019 •

Copy link
Copy Markdown
Member

This officially moves over astropy.utils.timer that apparently no one but vo_conesearch is using.

TODO

xref astropy/astropy#8898

Revert #1517

@bsipocz

bsipocz commented Jul 22, 2019

Copy link
Copy Markdown
Member

@pllim - let me know when you're ready for review.

@pllim pllim changed the title WIP: Move timer functions from astropy Move timer functions from astropy Jul 24, 2019
@pllim

pllim commented Jul 24, 2019

Copy link
Copy Markdown
Member Author

@bsipocz , it is ready. Thanks! 😄

@codecov

codecov Bot commented Jul 24, 2019 •

Copy link
Copy Markdown

Codecov Report

Merging #1508 into master will increase coverage by 0.19%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1508      +/-   ##
==========================================
+ Coverage   62.44%   62.64%   +0.19%     
==========================================
  Files         176      177       +1     
  Lines       14651    14727      +76     
==========================================
+ Hits         9149     9225      +76     
  Misses       5502     5502
Impacted Files Coverage Δ
astroquery/vo_conesearch/conesearch.py 27.47% <100%> (ø) ⬆️
astroquery/vo_conesearch/validator/validate.py 20.89% <100%> (ø) ⬆️
astroquery/utils/timer.py 100% <100%> (ø)

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 fca9945...c50bbc4. Read the comment docs.

Comment thread astroquery/utils/timer.py Outdated
@bsipocz

bsipocz commented Aug 1, 2019

Copy link
Copy Markdown
Member

Oh, vicious cycle. master on astroquery now run into the deprecation warning already been merged upstream, but can't yet merge this due to py2.

I think we can officially declare a 🔥 situation...

@keflavich

Copy link
Copy Markdown
Contributor

Can we deal with this? I don't really understand what's going on...

@bsipocz

bsipocz commented Aug 1, 2019

Copy link
Copy Markdown
Member

@keflavich - I'm trying my best to get those warnings ignored for 0.3.10. This can otherwise be merged once we remove the python2 testing (after 0.3.10).

Comment thread astroquery/vo_conesearch/tests/test_conesearch.py
@pllim

pllim commented Aug 2, 2019

Copy link
Copy Markdown
Member Author

@bsipocz , rebased. Now it only has things strictly related to moving over utils.timer. Thanks for your patience!

@bsipocz

bsipocz commented Oct 10, 2019

Copy link
Copy Markdown
Member

Can you rebase again? This should be ready to go in now.

Remove f-string for PY2 compat

Undo astropy#1517
@pllim

pllim commented Oct 10, 2019

Copy link
Copy Markdown
Member Author

Done 🤞

@bsipocz

bsipocz commented Oct 10, 2019

Copy link
Copy Markdown
Member

This failure is extremely weird, and I don't understand it. The changes has been made a few days ago, and it passed all the tests since.

@bsipocz

bsipocz commented Oct 10, 2019

Copy link
Copy Markdown
Member

Oh, never mind, I see.

Comment thread astroquery/conftest.py
@bsipocz

bsipocz commented Oct 10, 2019

Copy link
Copy Markdown
Member

Thanks @pllim!

@bsipocz
bsipocz merged commit e7d94e0 into astropy:master Oct 10, 2019
@pllim
pllim deleted the add-timer branch October 10, 2019 04:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants