Skip to content

Allow clip{,_lower,_upper} to use array-like thresholds (GH 6966) #9647

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 1 commit into from
Apr 28, 2015

Conversation

evanpw
Copy link
Contributor

@evanpw evanpw commented Mar 13, 2015

closes #6966

@evanpw
Copy link
Contributor Author

evanpw commented Mar 13, 2015

Sorry, first time contributing. My local testing wasn't getting to test_frame and test_series like I thought it was. This second commit should fix the problems.

@jreback jreback added the Bug label Mar 17, 2015
@jreback jreback added this to the 0.16.1 milestone Mar 17, 2015
@@ -2801,14 +2801,16 @@ def notnull(self):
"""
Copy link
Contributor

Choose a reason for hiding this comment

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

pls make sure that you have core.filemode=False in git

e.g. git config global --list (then turn it off). you generally don't change file modes (as they are set so that nose works correctly)

@jreback
Copy link
Contributor

jreback commented Mar 17, 2015

pls add a release note in whatnew (0.16.1), which will be available after we release 0.16.0 (prob this weekend)

@jreback
Copy link
Contributor

jreback commented Mar 20, 2015

whats new is now available for 0.16.1 5ebf521

@evanpw
Copy link
Contributor Author

evanpw commented Mar 24, 2015

I'm pretty sure the test failure is caused by a bug which is independent of my changes: pandas/io/data.py lines 174-182 should be indented and part of the else clause.

lower : float or array_like, default None
upper : float or array_like, default None
axis : int or string axis name, optional
Align object with lower and upper along the given axis.

Copy link
Contributor

Choose a reason for hiding this comment

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

can you add a doc-string example here (have a look at a function, say DataFrame.select_dtypes for how to format this in the dco-string)

@@ -19,6 +19,7 @@ Enhancements

Copy link
Contributor

Choose a reason for hiding this comment

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

you changed the mode of this file, can you revert pls.

@jreback
Copy link
Contributor

jreback commented Apr 28, 2015

@evanpw ok, if you can fix the file modes, looks good otherwise

@evanpw
Copy link
Contributor Author

evanpw commented Apr 28, 2015

Mode is fixed, rebased, squashed, and tests are green.

jreback added a commit that referenced this pull request Apr 28, 2015
Allow clip{,_lower,_upper} to use array-like thresholds (GH 6966)
@jreback jreback merged commit c68fec2 into pandas-dev:master Apr 28, 2015
@jreback
Copy link
Contributor

jreback commented Apr 28, 2015

ty sir!

@evanpw evanpw deleted the fix_clip branch April 28, 2015 11:57
@evanpw evanpw restored the fix_clip branch September 19, 2015 00:34
@evanpw evanpw deleted the fix_clip branch September 19, 2015 00:38
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.

BUG: clip_lower/-upper don't accept a sequence starting from 0.12.0
2 participants