From c2b3e08270d9f70ba64d183e2270709b5ab762ea Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Sat, 7 Jun 2014 12:07:43 +0900 Subject: [PATCH 1/2] Overwrite old scripts when installing from wheel. Fixes #1800 --- pip/wheel.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pip/wheel.py b/pip/wheel.py index 2d4f4df7570..ba7495d0a45 100644 --- a/pip/wheel.py +++ b/pip/wheel.py @@ -241,6 +241,10 @@ def is_entrypoint_wrapper(name): clobber(source, dest, False, fixer=fixer, filter=filter) maker = ScriptMaker(None, scheme['scripts']) + + # Ensure old scripts are overwritten. + # See https://github.com/pypa/pip/issues/1800 + maker.clobber = True # Ensure we don't generate any variants for scripts because this is almost # never what somebody wants. From 4950c7685c0f6f368d46bd4ccf42807d023ef286 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Sat, 7 Jun 2014 12:20:42 +0900 Subject: [PATCH 2/2] Fix flake8 error. Github's online editor is bad... --- pip/wheel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/wheel.py b/pip/wheel.py index ba7495d0a45..739eaf9280a 100644 --- a/pip/wheel.py +++ b/pip/wheel.py @@ -241,7 +241,7 @@ def is_entrypoint_wrapper(name): clobber(source, dest, False, fixer=fixer, filter=filter) maker = ScriptMaker(None, scheme['scripts']) - + # Ensure old scripts are overwritten. # See https://github.com/pypa/pip/issues/1800 maker.clobber = True