Skip to content

Move Windows protection check to specific commands #5312

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 4 commits into from
May 30, 2018

Conversation

pradyunsg
Copy link
Member

Fixes #5311

@pradyunsg pradyunsg added the type: enhancement Improvements to functionality label Apr 20, 2018
@pradyunsg pradyunsg requested a review from pfmoore April 20, 2018 09:52
@pradyunsg
Copy link
Member Author

TIL - quickly doing a rebase + a force push with the news files might reduce the build times since CI builds will fail to clone the old commit hash which GitHub tells them "is not longer available".

@pfmoore
Copy link
Member

pfmoore commented Apr 20, 2018

Wow, quick work, thanks @pradyunsg. I'll give it a try this evening.

@pradyunsg
Copy link
Member Author

Sure! :)

@pradyunsg
Copy link
Member Author

@pfmoore Could you investigate the test failure?

I'm not sure what's causing it...

@benoit-pierre
Copy link
Member

It's the Windows protection check doing its thing, this is fixed with:

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index f6162929..5e6548ec 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -47,7 +47,8 @@ def test_pep518_uses_build_env(script, data, original_setuptools):
 
 def test_pep518_with_user_pip(script, virtualenv, pip_src, data):
     virtualenv.system_site_packages = True
-    script.pip("install", "--ignore-installed", "--user", pip_src)
+    script.pip("install", "--ignore-installed", "--user", pip_src,
+               use_module=True)
     system_pip_dir = script.site_packages_path / 'pip'
     system_pip_dir.rmtree()
     system_pip_dir.mkdir()

@pradyunsg pradyunsg force-pushed the fix/windows-pip-blocker-message branch from 5f0365d to 3f6a4fb Compare April 21, 2018 09:12
@pradyunsg
Copy link
Member Author

Thanks @benoit-pierre!

@pradyunsg
Copy link
Member Author

I'll add unit tests in a follow up PR.

@pradyunsg pradyunsg added T: bugfix and removed type: enhancement Improvements to functionality labels May 11, 2018
@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 eligible for code review and hopefully merging!

@BrownTruck BrownTruck added the needs rebase or merge PR has conflicts with current master label May 19, 2018
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label May 19, 2018
@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 eligible for code review and hopefully merging!

@BrownTruck BrownTruck added the needs rebase or merge PR has conflicts with current master label May 22, 2018
@pradyunsg pradyunsg force-pushed the fix/windows-pip-blocker-message branch from b1eb4ac to 2a061c2 Compare May 30, 2018 10:31
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label May 30, 2018
@pradyunsg pradyunsg requested review from pfmoore and removed request for pfmoore May 30, 2018 10:32
@pradyunsg pradyunsg merged commit e671005 into pypa:master May 30, 2018
@pradyunsg pradyunsg deleted the fix/windows-pip-blocker-message branch May 30, 2018 13:22
@lock
Copy link

lock bot commented Jun 2, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot added the auto-locked Outdated issues that have been locked by automation label Jun 2, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Jun 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
auto-locked Outdated issues that have been locked by automation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The "don't use pip to modify itself" check is being run for "pip wheel"
5 participants