-
-
Notifications
You must be signed in to change notification settings - Fork 18.6k
CLN/TST remove compat.scipy #7296
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
Conversation
@@ -4063,7 +4063,7 @@ def test_nsmallest_nlargest(self): | |||
assert_series_equal(s.nsmallest(), s.iloc[[2, 3, 0, 4]]) | |||
|
|||
def test_rank(self): | |||
from pandas.compat.scipy import rankdata |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should these last two also be _skip_if_no_scipy()
?
Does this mean you can no longer use |
Ah ok, this is just in tests. Cool. |
yeh I think was just to check vs scipy (and maybe it wasn't included in testing suite at that point) |
@hayd, |
Sorry guys... I'm having some git-problems... |
It looks like you should remove the last commit (the merge one): http://stackoverflow.com/a/6866485/1240268 (I would first check that's the case with Then force push back to this PR: I think you forgot to
|
Ah, take that back with the "just remove last commit", I see one commit is there twice. I would either:
Then push back here: |
@hayd Thank you for the bail-out. My local git is pretty well munged at this point... What is the best way to nuke it? I've saved the "correct" copies of all affected files elsewhere so I can just drop them in. Should I just nuke the branches and do a fresh PR, or is there better way? |
I wouldn't nuke it just yet... create a new branch off master (assuming this branch was from there) and then drop them in or cherry-pick. You can then force push to this PR (using the code above), no need to nuke locally til it's successfully up here. That is:
If it's up here ok, then you can go crazy deleting branches. |
@hayd Thanks for the bailout!! |
np! This looks great. |
re-branch of #7253 (comment)
-Move
percentileofscore
tostats.misc
; UpdatepercentileRank
to reflect the move.-Change testing references to
compat.scipy.rankdata()
, to usescipy.stats.rankdata
directly-Delete compat.scipy