Skip to content

Small improvements to str_cat #12000

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

Closed
wants to merge 14 commits into from
Closed

Conversation

hack-c
Copy link

@hack-c hack-c commented Jan 8, 2016

closes #11435
closes #11334.

Added some doc examples to make the behavior with nan more clear, and catch an error condition when a sep is passed instead of an others (array) as an argument and print a more intuitive error message.

@jreback
Copy link
Contributor

jreback commented Jan 8, 2016

tests!

@jreback jreback added Missing-data np.nan, pd.NaT, pd.NA, dropna, isnull, interpolate Error Reporting Incorrect or improved errors from pandas Strings String extension data type and string data labels Jan 8, 2016
@@ -2057,6 +2059,17 @@ def test_method_on_bytes(self):
'S2').astype(object))
tm.assert_series_equal(result, expected)

def test_str_cat_raises_intuitive_error(self):
s = Series(['a','b','c','d'])
Copy link
Contributor

Choose a reason for hiding this comment

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

add the issue number as a comment here

@jreback
Copy link
Contributor

jreback commented Jan 8, 2016

pls also add entries in whatsnew (one for each of the bug fixes). we'll call ignoring nans a bug fix.

@jreback
Copy link
Contributor

jreback commented Jan 20, 2016

can you rebase / update

hack-c and others added 10 commits January 20, 2016 17:38
CLN: remove core/matrix.py, not imported into the pandas namespace
Added test cases for `_min_fitting_element` and `_max_fitting_element`
(unused) that would fail in master because of precision

Author: Ka Wo Chen <[email protected]>

Closes pandas-dev#12113 from kawochen/CLN-RI-max-fitting and squashes the following commits:

3cbc7f5 [Ka Wo Chen] CLN: cleaned RangeIndex._min_fitting_element
Author: Wes McKinney <[email protected]>

Closes pandas-dev#12114 from wesm/style/stats and squashes the following commits:

a3f8508 [Wes McKinney] CLN: fix flake8 warnings in pandas/stats
Author: Wes McKinney <[email protected]>

Closes pandas-dev#12115 from wesm/style/flake8-misc and squashes the following commits:

017ca16 [Wes McKinney] CLN: grab bag of flake8 fixes
@hack-c
Copy link
Author

hack-c commented Jan 22, 2016

I may have just botched this... tried rebasing on master and now there are many changes I didn't include reflected in the diff.

@jreback
Copy link
Contributor

jreback commented Jan 22, 2016

http://pandas.pydata.org/pandas-docs/stable/contributing.html#contributing-your-changes-to-pandas

git rebase -i master

then

git push <yourremote> <yourbranch> -f

@wesm
Copy link
Member

wesm commented Jan 22, 2016

You have to make sure your your master is in sync with upstream master.

You can revert to your original patch with "git reset --hard HASH" -- look in your git reflog to find the commit hash.

@hack-c
Copy link
Author

hack-c commented Feb 11, 2016

This was botched and left to languish-- have restarted and will ref this in the re-do.

@hack-c hack-c closed this Feb 11, 2016
@hack-c hack-c mentioned this pull request Feb 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Error Reporting Incorrect or improved errors from pandas Missing-data np.nan, pd.NaT, pd.NA, dropna, isnull, interpolate Strings String extension data type and string data
Projects
None yet
4 participants