From 23f976abe3ff45c30ea0840e4138b32ff6ce4fdf Mon Sep 17 00:00:00 2001
From: stonebig <stonebig>
Date: Fri, 25 Dec 2015 16:42:51 +0100
Subject: [PATCH 1/2] spyder_light out, spyder_reset in

---
 make.py                                             |  10 +++++-----
 .../icons/{spyder_light.ico => spyder_reset.ico}    | Bin
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename portable/icons/{spyder_light.ico => spyder_reset.ico} (100%)

diff --git a/make.py b/make.py
index 463c37b6..33e95130 100644
--- a/make.py
+++ b/make.py
@@ -517,9 +517,9 @@ def _create_launchers(self):
                              args='-m spyderlib.start_app',
                              workdir='${WINPYDIR}\Scripts',
                              settingspath=settingspath)
-        self.create_launcher('Spyder (light).exe', 'spyder_light.ico',
+        self.create_launcher('Spyder (reset).exe', 'spyder_reset.ico',
                              command='${WINPYDIR}\python.exe',
-                             args='-m spyderlib.start_app --light',
+                             args='-m spyderlib.start_app --reset',
                              workdir='${WINPYDIR}\Scripts',
                              settingspath=settingspath)
 
@@ -633,7 +633,7 @@ def _create_batch_scripts(self):
 
 The purpose of these files is to help the user writing his/her own
 batch file to call Python scripts inside WinPython.
-The examples here ('spyder.bat', 'spyder_light.bat', 'wpcp.bat',
+The examples here ('spyder.bat', 'spyder_reset.bat', 'wpcp.bat',
 'pyqt_demo.bat', 'python.bat' and 'cmd.bat') are quite similar to the
 launchers located in the parent directory.
 The environment variables are set-up in 'env.bat'.""")
@@ -698,10 +698,10 @@ def _create_batch_scripts(self):
         self.create_python_batch('spyder.bat', 'spyderlib.start_app',
                                  workdir='Scripts',
                                  command = '%WINPYDIR%\python.exe -m')
-        self.create_python_batch('spyder_light.bat', 'spyderlib.start_app',
+        self.create_python_batch('spyder_reset.bat', 'spyderlib.start_app',
                                  workdir='Scripts',
                                  command = '%WINPYDIR%\python.exe -m',
-                                 options='--light')
+                                 options='--reset')
         self.create_python_batch('register_python.bat', 'register_python',
                                  workdir='Scripts')
         self.create_batch_script('register_python_for_all.bat',
diff --git a/portable/icons/spyder_light.ico b/portable/icons/spyder_reset.ico
similarity index 100%
rename from portable/icons/spyder_light.ico
rename to portable/icons/spyder_reset.ico

From 4d19ee34c61ef2178a6c86a1435f85e371a4e188 Mon Sep 17 00:00:00 2001
From: stonebig <stonebig>
Date: Fri, 25 Dec 2015 16:43:25 +0100
Subject: [PATCH 2/2] workaround a pip bug

---
 make.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make.py b/make.py
index 33e95130..5938acc8 100644
--- a/make.py
+++ b/make.py
@@ -800,7 +800,7 @@ def make(self, remove_existing=True, requirements=None):  #, find_links=None):
 
             # force update of pip (FIRST) and setuptools here
             for req in ('pip', 'setuptools'):   
-                actions = ["install","--upgrade", req]
+                actions = ["install","--upgrade", "--force-reinstall", req]
                 if self.install_options is not None:
                     actions += self.install_options
                 print("piping %s" % ' '.join(actions))