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.

Sign up for GitHub

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

Jump to bottom

Ignore errors copying socket files for source installs (in Python 3). #6844

Merged
merged 6 commits into from
Aug 21, 2019
Merged

Ignore errors copying socket files for source installs (in Python 3). #6844

merged 6 commits into from
Aug 21, 2019

Conversation

chrahunt
Copy link
Member

@chrahunt chrahunt commented Aug 8, 2019 •
edited
Loading

Addresses the same as #6802, but only worries about Python 3 compatibility.

Fixes #5306.

@chrahunt chrahunt force-pushed the bugfix/dont-copy-socket-files-from-source-in-python3 branch from 4fed7c2 to 477c2c7 Compare August 8, 2019 00:59
cjerdonek
cjerdonek approved these changes Aug 8, 2019
View reviewed changes
Copy link
Member

@cjerdonek cjerdonek left a comment

Choose a reason for hiding this comment

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

Looks great! Really good, thorough work on this. 👍

(And looking at it I do think the Py3 approach makes for a cleaner, simpler fix.)

src/pip/_internal/download.py Outdated Show resolved Hide resolved
@chrahunt chrahunt force-pushed the bugfix/dont-copy-socket-files-from-source-in-python3 branch from 28b562a to ed71173 Compare August 9, 2019 23:41
@chrahunt
Copy link
Member Author

@pradyunsg do you want to give this a look? It supersedes #6802 which you had approved previously.

pradyunsg
pradyunsg reviewed Aug 11, 2019
View reviewed changes
Copy link
Member

@pradyunsg pradyunsg left a comment

Choose a reason for hiding this comment

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

LGTM functionally.

A couple of comments "around" the code change: news file and tests.

Note that I prefix my nit-picky comments with "nit: " -- I don't think they're worth spending energy debating on. Please do feel free to ignore them if you disagree and if you feel like it, comment on why you do disagree. I aim never to have extended discussions on "nit" comments. :)

news/5306.bugfix Outdated Show resolved Hide resolved
tests/lib/filesystem.py Show resolved Hide resolved
tests/unit/test_utils_filesystem.py Outdated Show resolved Hide resolved
tests/unit/test_utils_filesystem.py Outdated Show resolved Hide resolved
src/pip/_internal/download.py Show resolved Hide resolved
src/pip/_internal/download.py Show resolved Hide resolved
@chrahunt chrahunt force-pushed the bugfix/dont-copy-socket-files-from-source-in-python3 branch from d54e5d8 to 3c5345a Compare August 11, 2019 19:11
@chrahunt
Copy link
Member Author

Updated to address comments. Should be ready for another round. 👍

@chrahunt chrahunt mentioned this pull request Aug 13, 2019
Closed
@cjerdonek
Copy link
Member

Once this is good to merge, @chrahunt, would you mind waiting until after PR #6866 is done before merging this? I suspect it will be easier for you to carry this change over than vice versa, given that the other PR is being prepared by a first-time contributor.

@chrahunt
Copy link
Member Author

Fine by me. I was thinking along those lines but didn't know how to articulate it, so thank you.

@BrownTruck
Copy link
Contributor

Hello!

I am an automated bot and I have noticed that this pull request is not currently able to be merged. If you are able to either merge the master branch into this pull request or rebase this pull request against master then it will be eligible for code review and hopefully merging!

@BrownTruck BrownTruck added the needs rebase or merge PR has conflicts with current master label Aug 16, 2019
@chrahunt chrahunt force-pushed the bugfix/dont-copy-socket-files-from-source-in-python3 branch from ff64108 to c9dc2db Compare August 16, 2019 02:20
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Aug 16, 2019
@chrahunt chrahunt force-pushed the bugfix/dont-copy-socket-files-from-source-in-python3 branch from c9dc2db to a7dbd12 Compare August 16, 2019 04:55
@cjerdonek
Copy link
Member

Since PR #6866 is taking longer than I expected it would to be ready, I'd like to merge this sooner rather than later. Any objections?

@chrahunt
Copy link
Member Author

Nope, merge away. 🚀

@cjerdonek cjerdonek merged commit 5e97de4 into pypa:master Aug 21, 2019
@cjerdonek
Copy link
Member

Great! 🎉

@chrahunt chrahunt deleted the bugfix/dont-copy-socket-files-from-source-in-python3 branch August 21, 2019 23:08
@lock lock bot added the auto-locked Outdated issues that have been locked by automation label Sep 20, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Sep 20, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@pradyunsg pradyunsg pradyunsg left review comments

@cjerdonek cjerdonek cjerdonek approved these changes

Assignees
No one assigned
Labels
auto-locked Outdated issues that have been locked by automation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

pip install -U . fails when there's a UNIX domain socket in the current directory
5 participants
@chrahunt @cjerdonek @BrownTruck @pradyunsg @pypa-bot