Skip to content

CLN: Converting assert_'s to specialized forms, in pandas/*/tests #6267

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
Feb 7, 2014
Merged

CLN: Converting assert_'s to specialized forms, in pandas/*/tests #6267

merged 1 commit into from
Feb 7, 2014

Conversation

bwignall
Copy link
Contributor

@bwignall bwignall commented Feb 5, 2014

Work on #6175, in pandas/*/tests. Tests still pass locally. Finishes most (all?) of the remaining vanilla assert_(x == y) conversions

@jreback jreback added the Testing label Feb 7, 2014
@jreback jreback added this to the 0.14.0 milestone Feb 7, 2014
@jreback
Copy link
Contributor

jreback commented Feb 7, 2014

just noticed this...can you rebase?

@bwignall
Copy link
Contributor Author

bwignall commented Feb 7, 2014

I will give it a try.

Work on #6175, in pandas/*/tests. Tests still pass locally. Finishes most (all?) of the remaining vanilla assert_(x == y) conversions
@bwignall
Copy link
Contributor Author

bwignall commented Feb 7, 2014

Just tried my first rebasing. How does it look, @jreback ?

git checkout assert_6175_6
git rebase master
[resolve one merge conflict]
git add pandas/io/tests/test_sql.py
git rebase --continue
git push origin assert_6175_6
[Error about "Updates were rejected because the tip of your current branch is behind its remote counterpart." Consult Google, and find suggestion...]
git push -f origin assert_6175_6

@cpcloud
Copy link
Member

cpcloud commented Feb 7, 2014

Your rebase is okay assuming your local master is synced with upstream master. Personally, I like to keep a remote called upstream and rebase on top of that right after fetching from it

jreback added a commit that referenced this pull request Feb 7, 2014
CLN: Converting assert_'s to specialized forms, in pandas/*/tests
@jreback jreback merged commit 8492889 into pandas-dev:master Feb 7, 2014
@jreback
Copy link
Contributor

jreback commented Feb 7, 2014

looks gr8 @bwignall

if anything more would appreciate the update, otherwise ping and we can close the issue out

@bwignall bwignall deleted the assert_6175_6 branch February 18, 2014 03:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Testing pandas testing functions or related to the test suite
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants