Skip to content

0.23.4 backports 1 #22178

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

Merged
merged 4 commits into from
Aug 3, 2018
Merged

Conversation

TomAugspurger
Copy link
Contributor

@TomAugspurger TomAugspurger commented Aug 2, 2018

Closes #22166

chris-b1 and others added 3 commits August 2, 2018 15:16
* Appveyor 3.7

* ci package list

* change image type

* try hack fix

* lint

* use isnan on problem function

* use numpy compat isnan

* use right isnan

* work around OSX math undefs

* cleanup const

* fix reversion

* ...

(cherry picked from commit 7a2fbce)
(cherry picked from commit e4381b6)
@TomAugspurger TomAugspurger added this to the 0.23.4 milestone Aug 2, 2018
@@ -14,6 +14,7 @@ cnp.import_array()


cdef extern from "../src/headers/cmath" namespace "std":
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@chris-b1 @jbrockmendel this changed between 0.23.x and master. On master we use

cdef extern from "src/headers/cmath" namespace "std":

But here we use ../src/headers/cmath. Does this look correct for 0.23.x?

Copy link
Member

Choose a reason for hiding this comment

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

This looks like something I would have nit-picked about. The "../" is inaccurate in this context. Evidently the cython/gcc compiler doesn't mind either way, but I'm pretty sure the one in master is More Correct.

@gfyoung
Copy link
Member

gfyoung commented Aug 3, 2018

Closes #22166

@TomAugspurger : I thought we were experimenting with a bot that auto-backported?

Separate note: some weird pytables failures on Travis and Circle. Not sure what happened but rerunning to confirm.

@TomAugspurger
Copy link
Contributor Author

I thought we were experimenting with a bot that auto-backported?

Yes, tagging an issue with a milestone will automatically backport it if possible.

I think the whatsnew changes weren't tagged with the 0.23.4 milestone, because it contained changes that shouldn't be backported.

The window fix had a merge conflict.

@TomAugspurger TomAugspurger mentioned this pull request Aug 3, 2018
@TomAugspurger TomAugspurger merged commit b9bacc9 into pandas-dev:0.23.x Aug 3, 2018
@TomAugspurger TomAugspurger deleted the 0.23.4-backports-1 branch August 3, 2018 17:17
@codecov
Copy link

codecov bot commented Aug 3, 2018

Codecov Report

Merging #22178 into 0.23.x will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           0.23.x   #22178      +/-   ##
==========================================
+ Coverage   91.83%   91.83%   +<.01%     
==========================================
  Files         153      153              
  Lines       49592    49592              
==========================================
+ Hits        45541    45545       +4     
+ Misses       4051     4047       -4
Flag Coverage Δ
#multiple 90.24% <ø> (ø) ⬆️
#single 41.79% <ø> (-0.06%) ⬇️
Impacted Files Coverage Δ
pandas/core/frame.py 97.24% <0%> (+0.05%) ⬆️
pandas/core/panel.py 97.32% <0%> (+0.44%) ⬆️

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 6a0a950...7300fe7. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants