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

Remove the workarounds/hacks to handle distribute -> setuptools #2767

Merged
merged 1 commit into from May 9, 2015

Conversation

Projects
None yet
3 participants
@dstufft
Member

dstufft commented May 9, 2015

Closes #2435
Fixes #1122
Fixes #1851

@rbtcollins

This comment has been minimized.

Show comment
Hide comment
@rbtcollins

rbtcollins May 9, 2015

Contributor

Retrying (Retry(total=4, connect=None, read=None, redirect=None)) after connection broken by 'ConnectTimeoutError(<pip._vendor.requests.packages.urllib3.connection.VerifiedHTTPSConnection object at 0x7ff79de07810>, 'Connection to pypi.python.org timed out. (connect timeout=15)')': /simple/wheel/

Contributor

rbtcollins commented May 9, 2015

Retrying (Retry(total=4, connect=None, read=None, redirect=None)) after connection broken by 'ConnectTimeoutError(<pip._vendor.requests.packages.urllib3.connection.VerifiedHTTPSConnection object at 0x7ff79de07810>, 'Connection to pypi.python.org timed out. (connect timeout=15)')': /simple/wheel/

@rbtcollins

This comment has been minimized.

Show comment
Hide comment
@rbtcollins

rbtcollins May 9, 2015

Contributor

It will be nice not to have the hacks, but now I need to merge in the conflicts to my branch :/

Contributor

rbtcollins commented May 9, 2015

It will be nice not to have the hacks, but now I need to merge in the conflicts to my branch :/

dstufft added a commit that referenced this pull request May 9, 2015

Merge pull request #2767 from dstufft/remove-workarounds
Remove the workarounds/hacks to handle distribute -> setuptools

@dstufft dstufft merged commit 0017942 into pypa:develop May 9, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@dstufft dstufft deleted the dstufft:remove-workarounds branch May 9, 2015

@glyph

This comment has been minimized.

Show comment
Hide comment
@glyph

glyph commented May 9, 2015

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment