Skip to content

TST: win32 paths cannot be turned into URLs by prefixing them with "file://" v2 #5100

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
Oct 28, 2013

Conversation

mindw
Copy link
Contributor

@mindw mindw commented Oct 3, 2013

Rebased on master (unable to use same pull request). Closes #4580.

see http://stackoverflow.com/questions/11687478/convert-a-filename-to-a-file-url

@jreback
Copy link
Contributor

jreback commented Oct 8, 2013

@cpcloud for 0.13?

@ghost ghost assigned cpcloud Oct 8, 2013
@jreback
Copy link
Contributor

jreback commented Oct 14, 2013

@cpcloud 0.13?

@cpcloud
Copy link
Member

cpcloud commented Oct 19, 2013

@mindw Can you rebase? We'd like to get this in for 0.13 (by next week). Thanks!

@mindw
Copy link
Contributor Author

mindw commented Oct 19, 2013

rebase to where?

@cpcloud
Copy link
Member

cpcloud commented Oct 19, 2013

Rebase to this PR.

Assuming you're on the local branch associated with this PR:

# add pandas upstream if you don't have it already
git remote add upstream git://github.com/pydata/pandas.git

# fetch upstream changes (do this anyway)
git fetch upstream

# rebase on top of upstream/master (this is current master)
git rebase upstream/master

# force push
git push --force

You might need to resolve merge conflicts before force pushing.

@mindw
Copy link
Contributor Author

mindw commented Oct 20, 2013

ping.

@jreback
Copy link
Contributor

jreback commented Oct 23, 2013

@cpcloud pls review this, or can defer to 0.14....up2u

@jreback
Copy link
Contributor

jreback commented Oct 27, 2013

bumping to 0.14, unless reviewed before

@jtratner
Copy link
Contributor

I'll take it.

@jtratner
Copy link
Contributor

I'd prefer the io/common name to be file_path_to_url - seems clearer. Otherwise should be fine, so long as it passes Travis.

@ghost ghost assigned jtratner Oct 28, 2013
@jtratner
Copy link
Contributor

Also please rebase again and squash your commits together.

@mindw
Copy link
Contributor Author

mindw commented Oct 28, 2013

Ok, please review.

Why was it pushed to 0.14 again?

return urljoin('file:', pathname2url(path))



Copy link
Contributor

Choose a reason for hiding this comment

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

please remove this extra line.

@mindw
Copy link
Contributor Author

mindw commented Oct 28, 2013

Ok.

@jtratner
Copy link
Contributor

this is fine, just remove the line.

I can't merge this until you enable Travis though - looks like you had it set up months ago - see more here - https://github.com/pydata/pandas/blob/master/CONTRIBUTING.md#steps-to-enable-travis-ci

@mindw
Copy link
Contributor Author

mindw commented Oct 28, 2013

I disabled it due to known test failures (test_fred?)

@jtratner
Copy link
Contributor

those are fixed now, but can't merge this unless you set up Travis.

@mindw
Copy link
Contributor Author

mindw commented Oct 28, 2013

Ok fixed. Waiting in line.

-gabi

On Tue, Oct 29, 2013 at 12:13 AM, Jeff Tratner notifications@github.comwrote:

those are fixed now, but can't merge this unless you set up Travis.


Reply to this email directly or view it on GitHubhttps://github.com//pull/5100#issuecomment-27262050
.

jtratner added a commit that referenced this pull request Oct 28, 2013
TST: win32 paths cannot be turned into URLs by prefixing them with "file://" v2
@jtratner jtratner merged commit 1f2cb49 into pandas-dev:master Oct 28, 2013
@jtratner
Copy link
Contributor

thanks!

@mindw mindw deleted the win32_tests_fix_master branch October 29, 2013 05:15
@mindw mindw restored the win32_tests_fix_master branch February 11, 2014 14:16
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