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

EHN: Allow load_data to load problematic R datasets #5042

Merged
merged 1 commit into from
Oct 2, 2013

Conversation

unutbu
Copy link
Contributor

@unutbu unutbu commented Sep 29, 2013

TST: Move tests from rpy/common.py to tests/test_rpy.py
TST: Add tests to demonstrate the enhancements made to rpy/common.py.
DOC: Add explanation to doc/source/release.rst

@unutbu
Copy link
Contributor Author

unutbu commented Sep 29, 2013

This is related to #5036, which I unwittingly closed while trying to clean up my commit history.

@jreback
Copy link
Contributor

jreback commented Sep 29, 2013

@unutbu looks fine...and since you are the one to test it, good to go?

@jreback
Copy link
Contributor

jreback commented Sep 29, 2013

actually....do you want to put a mention (maybe code-block example?) in v0.13.0?

@unutbu
Copy link
Contributor Author

unutbu commented Sep 29, 2013

Yes, I think it is good to go.

@unutbu
Copy link
Contributor Author

unutbu commented Sep 29, 2013

(Assuming the change to v.0.13.0.txt is acceptable).

@jtratner
Copy link
Contributor

@unutbu can you move the test file into a subdirectory of rpy?
so it would go into rpy/tests/<your_filename_here>.py

@jreback
Copy link
Contributor

jreback commented Oct 1, 2013

ready to go on this?

@jtratner
Copy link
Contributor

jtratner commented Oct 1, 2013

Need to add init file to test folder, right? (maybe I'm just missing it)

@unutbu
Copy link
Contributor Author

unutbu commented Oct 1, 2013

I hope this isn't too many commits. If so, I could delete this branch and start a new one with a shorter history. Please tell me if there is a better way.

@jreback
Copy link
Contributor

jreback commented Oct 1, 2013

can u rebase and squash?

no need to delete

https://github.com/pydata/pandas/wiki/Using-Git

@jreback
Copy link
Contributor

jreback commented Oct 1, 2013

@jtratner @cpcloud merge?

@cpcloud
Copy link
Member

cpcloud commented Oct 1, 2013

let me test this out

@cpcloud
Copy link
Member

cpcloud commented Oct 1, 2013

needs a rebase ... there's probably a merge conflict with release or v0.13.0.txt

@cpcloud
Copy link
Member

cpcloud commented Oct 1, 2013

looks good on my end ... merge conflicts in the two files mentioned ... @unutbu just rebase and good 2 go

.. code-block:: python

import pandas.rpy.common as com
com.load_data(Titanic')
Copy link
Member

Choose a reason for hiding this comment

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

missing a quote here

…tasets

TST: Move tests from rpy/common.py to rpy/tests/test_common.py
TST: Add tests to demonstrate the enhancements made to rpy/common.py.
DOC: Add explanation to doc/source/release.rst and doc/source/v0.13.0.txt
@jreback jreback merged commit 96033e0 into pandas-dev:master Oct 2, 2013
@jreback
Copy link
Contributor

jreback commented Oct 2, 2013

thank you

@unutbu unutbu deleted the r-dataset branch October 2, 2013 22:26
@unutbu
Copy link
Contributor Author

unutbu commented Oct 3, 2013

No, thank you. That was fun!

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.

4 participants