Skip to content

Commit

Permalink
Merge from 3.x: PR #7260
Browse files Browse the repository at this point in the history
Fixes #6899
  • Loading branch information
ccordoba12 committed Jun 6, 2018
2 parents bd86ec1 + 28da47d commit 1e7f637
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion spyder/utils/external/lockfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ def lock(self):

# Valid names for main script
names = set(['spyder', 'spyder3', 'spyder.exe',
'spyder3.exe', 'bootstrap.py'])
'spyder3.exe', 'bootstrap.py',
'spyder-script.py'])
if running_under_pytest():
names.add('runtests.py')

Expand Down

0 comments on commit 1e7f637

Please sign in to comment.