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.

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

Panel tshift 4853 #4864

Merged
merged 2 commits into from
Sep 18, 2013
Merged

Panel tshift 4853 #4864

merged 2 commits into from
Sep 18, 2013

Conversation

dalejung
Copy link
Contributor

closes #4853

I think I'm doing this right. I moved the tshift into generic and had shift offload to tshift if freq is found.

@dalejung
Copy link
Contributor Author

err, let me get Travis CI running on my fork. it passes nosetests on my local.

@jreback
Copy link
Contributor

jreback commented Sep 17, 2013

  • travis (I see you already started that!)
  • release notes

@dalejung
Copy link
Contributor Author

quick q, for the commits that make up a PR, do they need to follow the ENH/BUG/etc format? Or does everything get smushed into a single commit anyways when merged into master.

@jreback
Copy link
Contributor

jreback commented Sep 17, 2013

if u r going to squash then try to make the top one be descriptive
i try to make them all though

@TomAugspurger
Copy link
Contributor

You'll want to squash your commits down to a single commit before it's merged.

git fetch upstream
git checkout panel-tshift-4853
git rebase -i upstream/master

This should open your editor (-i stands for interactive) and you can follow the instructions there to squash or fixup your commits to just one. Looking at your commits, you could probably squash the second into the first and then choose fixup for the other two.

Once that's done you can use git push origin panel-tshift-4853 -f to push to the branch in this PR. Be careful with the -f option though. This will mess things up if others are working off your branch.

@jtratner
Copy link
Contributor

Does this change Series, DataFrame or any sparse object behavior? (given
that you're changing NDFrame) If so, should test.

@jreback
Copy link
Contributor

jreback commented Sep 17, 2013

@dalejung I did a PR on your branch, dalejung#1 which removes shift from series and dataframe and puts it in generic.py you can cherry-pick this.

@dalejung
Copy link
Contributor Author

@jreback cherry picked the cleanup, added release notes, and enabled travis

@jreback
Copy link
Contributor

jreback commented Sep 18, 2013

great looks good
will review soon

@dalejung
Copy link
Contributor Author

err, sorry hold off a bit. I started generalizing the shift infrastructure so Panel could use it. Need to split off into its own branch

@dalejung
Copy link
Contributor Author

okay, split off the additional work into its own branch/issue.

@jreback
Copy link
Contributor

jreback commented Sep 18, 2013

@dalejung let me know if you want to merge this (or finish the other PR first)

@dalejung
Copy link
Contributor Author

@jreback This can be merged first. thx

@jreback
Copy link
Contributor

jreback commented Sep 18, 2013

alright..looks fine...can you squash down a bit?

TST: Added Panel.tshift test case
RST: Added to release notes
CLN: on top of dale-jung 4863, remove shift from series.py, move to generic.py
@dalejung
Copy link
Contributor Author

squashed. sorry used to hg where the commits don't carry over after merge. This PR has definitely leveled up my git-fu.

jreback added a commit that referenced this pull request Sep 18, 2013
@jreback jreback merged commit b039c1d into pandas-dev:master Sep 18, 2013
@jreback
Copy link
Contributor

jreback commented Sep 18, 2013

thanks!

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.

tshift does not work for Panels
4 participants