Skip to content

Commit 582d3f5

Browse files
committed
Merge pull request #227 from stonebig/master
no more spyder_light
2 parents 7c0ef6d + 4d19ee3 commit 582d3f5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

make.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,9 @@ def _create_launchers(self):
517517
args='-m spyderlib.start_app',
518518
workdir='${WINPYDIR}\Scripts',
519519
settingspath=settingspath)
520-
self.create_launcher('Spyder (light).exe', 'spyder_light.ico',
520+
self.create_launcher('Spyder (reset).exe', 'spyder_reset.ico',
521521
command='${WINPYDIR}\python.exe',
522-
args='-m spyderlib.start_app --light',
522+
args='-m spyderlib.start_app --reset',
523523
workdir='${WINPYDIR}\Scripts',
524524
settingspath=settingspath)
525525

@@ -633,7 +633,7 @@ def _create_batch_scripts(self):
633633
634634
The purpose of these files is to help the user writing his/her own
635635
batch file to call Python scripts inside WinPython.
636-
The examples here ('spyder.bat', 'spyder_light.bat', 'wpcp.bat',
636+
The examples here ('spyder.bat', 'spyder_reset.bat', 'wpcp.bat',
637637
'pyqt_demo.bat', 'python.bat' and 'cmd.bat') are quite similar to the
638638
launchers located in the parent directory.
639639
The environment variables are set-up in 'env.bat'.""")
@@ -698,10 +698,10 @@ def _create_batch_scripts(self):
698698
self.create_python_batch('spyder.bat', 'spyderlib.start_app',
699699
workdir='Scripts',
700700
command = '%WINPYDIR%\python.exe -m')
701-
self.create_python_batch('spyder_light.bat', 'spyderlib.start_app',
701+
self.create_python_batch('spyder_reset.bat', 'spyderlib.start_app',
702702
workdir='Scripts',
703703
command = '%WINPYDIR%\python.exe -m',
704-
options='--light')
704+
options='--reset')
705705
self.create_python_batch('register_python.bat', 'register_python',
706706
workdir='Scripts')
707707
self.create_batch_script('register_python_for_all.bat',
@@ -800,7 +800,7 @@ def make(self, remove_existing=True, requirements=None): #, find_links=None):
800800

801801
# force update of pip (FIRST) and setuptools here
802802
for req in ('pip', 'setuptools'):
803-
actions = ["install","--upgrade", req]
803+
actions = ["install","--upgrade", "--force-reinstall", req]
804804
if self.install_options is not None:
805805
actions += self.install_options
806806
print("piping %s" % ' '.join(actions))
File renamed without changes.

0 commit comments

Comments
 (0)