Skip to content
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.

Sign up for GitHub

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

Jump to bottom

BUG: DataFrame.align bug with join keyword (GH13914) #13216

Closed
wants to merge 7 commits into from
Closed

BUG: DataFrame.align bug with join keyword (GH13914) #13216

wants to merge 7 commits into from

Conversation

pfrcks
Copy link
Contributor

@pfrcks pfrcks commented May 18, 2016 •
edited by jorisvandenbossche
Loading

@pfrcks
Copy link
Contributor Author

pfrcks commented May 18, 2016

@jreback Is this okay?

@jreback
Copy link
Contributor

jreback commented May 18, 2016

in the future, simply push to the SAME PR, don't open new ones for the same thing. ok for now.

jreback
jreback reviewed May 18, 2016
View reviewed changes
doc/source/whatsnew/v0.18.2.txt
@@ -149,3 +149,4 @@ Bug Fixes
- Bug in ``NaT`` - ``Period`` raises ``AttributeError`` (:issue:`13071`)
- Bug in ``Period`` addition raises ``TypeError`` if ``Period`` is on right hand side (:issue:`13069`)
- Bug in ``pd.set_eng_float_format()`` that would prevent NaN's from formatting (:issue:`11981`)
- Fixed the bug regarding the unavailabilty of ``empty`` attribute for Index. The ``empty()`` function for Index has been implemented. The function returns True for an empty Index and False for a non empty Index (:issue: `13207`)
Copy link
Contributor

Choose a reason for hiding this comment

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

Index gained the .empty attribute.

@jreback jreback added Indexing Related to indexing on series/frames, not to indexes themselves API Design labels May 18, 2016
@pfrcks
Copy link
Contributor Author

pfrcks commented May 18, 2016

@jreback Implemented all of your comments. Hope it's fine now.
Regarding to the PR push activities, I'll keep it in mind.

sinhrks
sinhrks reviewed May 19, 2016
View reviewed changes
doc/source/whatsnew/v0.18.2.txt
@@ -149,3 +149,4 @@ Bug Fixes
- Bug in ``NaT`` - ``Period`` raises ``AttributeError`` (:issue:`13071`)
- Bug in ``Period`` addition raises ``TypeError`` if ``Period`` is on right hand side (:issue:`13069`)
- Bug in ``pd.set_eng_float_format()`` that would prevent NaN's from formatting (:issue:`11981`)
- Index gained the .empty attribute. The function returns True for an empty Index and False for a non empty Index (:issue: `13207`)
Copy link
Member

Choose a reason for hiding this comment

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

Pls quote class and property with ``.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@sinhrks Done.

@pfrcks
Copy link
Contributor Author

pfrcks commented May 20, 2016

@MaximilianR It was a typo. Fixed it.

jreback
jreback reviewed May 20, 2016
View reviewed changes
doc/source/whatsnew/v0.18.2.txt
@@ -149,3 +149,4 @@ Bug Fixes
- Bug in ``NaT`` - ``Period`` raises ``AttributeError`` (:issue:`13071`)
- Bug in ``Period`` addition raises ``TypeError`` if ``Period`` is on right hand side (:issue:`13069`)
- Bug in ``pd.set_eng_float_format()`` that would prevent NaN's from formatting (:issue:`11981`)
- ``Index`` gained the ``.empty`` attribute. The function returns True for an empty ``Index`` and False for a non empty ``Index`` (:issue: `13207`)
Copy link
Contributor

Choose a reason for hiding this comment

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

Just the first sentence. Move to enhancements.

@pfrcks
Copy link
Contributor Author

pfrcks commented May 20, 2016

@jreback I think I have it this time. Is this method right?

@jreback
Copy link
Contributor

jreback commented May 27, 2016

can you rebase / update

@pfrcks
Copy link
Contributor Author

pfrcks commented May 27, 2016

@jreback
You mean
git checkout bug13207
git rebase master
git push origin bug13207

Right?

@jreback
Copy link
Contributor

jreback commented May 27, 2016

yes, see docs here

@pfrcks
Copy link
Contributor Author

pfrcks commented May 27, 2016

@jreback Done. I hope this is alright.

jreback
jreback reviewed May 27, 2016
View reviewed changes
doc/source/whatsnew/v0.18.2.txt
@@ -39,6 +39,8 @@ Other enhancements
idx = pd.Index(["a1a2", "b1", "c1"])
idx.str.extractall("[ab](?P<digit>\d)")

- ``Index`` gained the ``.empty`` attribute. (:issue: `13207`)

Copy link
Contributor

Choose a reason for hiding this comment

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

no space between : and '

@jreback
Copy link
Contributor

jreback commented May 27, 2016

I don't see any changes, you need to git push yourbranchname -f

@pfrcks
Copy link
Contributor Author

pfrcks commented May 28, 2016

I did a git push origin bug13207 -f

If I do a git push bug13207 -f it says
Please make sure you have the correct access rights
and the repository exists

@jreback
Copy link
Contributor

jreback commented May 28, 2016

you cannot push to origin you need to push to your fork

@pfrcks
Copy link
Contributor Author

pfrcks commented May 28, 2016

My origin is set as my forked repo.

git remote -v

Output:
origin git@github.com:pfrcks/pandas.git (fetch)
origin git@github.com:pfrcks/pandas.git (push)

@gfyoung
Copy link
Member

gfyoung commented May 28, 2016

@pfrcks : You can set your local branch to track your origin version by doing the following:

git push -u origin <branch_name>

From then on, you can just do git push -f or git push

@pfrcks
Copy link
Contributor Author

pfrcks commented May 29, 2016

@gfyoung I have followed the comments you gave.

It gives "Everything up-to-date" as output.

@gfyoung
Copy link
Member

gfyoung commented May 29, 2016

@pfrcks: that's perfectly fine! That's because your local branch is sync'ed with your remote branch with the same name. You can now see that by typing git status

@jreback
Copy link
Contributor

jreback commented Sep 9, 2016

can you rebase / update?

@wesm
Copy link
Member

wesm commented Sep 11, 2016

You should git merge --squash, commit that, git reset --hard upstream/master, then cherry pick the merged commit. That will clean up the merge commit etc.

@pfrcks
Copy link
Contributor Author

pfrcks commented Sep 11, 2016

I am currently on bug13207 branch that I have created.
Issuing git merge --squash gives (nothing to squash)Already up-to-date.

I followed the rest of the steps and have again pushed the branch using git push -f origin bug13207

@jorisvandenbossche
Copy link
Member

jorisvandenbossche commented Sep 14, 2016 •
edited
Loading

@pfrcks Possibly your upstream master was not updated? (in any case, although you say you force pushed, no new/rebased commits are in this PR and there are still conflicts, so something went wrong). Can you do

git fetch upstream

before rebasing/merging? And then force push again?

@jreback
Copy link
Contributor

jreback commented Nov 25, 2016

can you rebase this on master

@pfrcks
Copy link
Contributor Author

pfrcks commented Nov 26, 2016

I rebased.

git fetch origin
git rebase origin/master

@jreback
Copy link
Contributor

jreback commented Dec 26, 2016 •
edited
Loading

can you rebase, move release note to 0.20.0

@ssanderson ssanderson mentioned this pull request Jan 31, 2017
Closed
4 tasks
@jorisvandenbossche jorisvandenbossche changed the title BUG: GH13207 Fixed. Added empty attribute for Index. BUG: DataFrame.align bug with join keyword (GH13914) Jan 31, 2017
@jreback
Copy link
Contributor

jreback commented Feb 1, 2017

closing as stale

@jreback jreback closed this Feb 1, 2017
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
API Design Indexing Related to indexing on series/frames, not to indexes themselves
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

align with broadcast_axis specified always uses inner join when aligning dataframe and series on other axis.
7 participants
@pfrcks @jreback @gfyoung @wesm @jorisvandenbossche @sinhrks @max-sixty