You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
2.1 KiB
56 lines
2.1 KiB
4 years ago
|
diff --git a/setup.py b/setup.py
|
||
4 years ago
|
index 2d5d58b..4adc952 100644
|
||
4 years ago
|
--- a/setup.py
|
||
|
+++ b/setup.py
|
||
|
@@ -31,13 +31,6 @@ import shutil
|
||
|
from distutils.core import setup
|
||
|
from distutils.command.install_data import install_data
|
||
|
|
||
|
-
|
||
|
-#==============================================================================
|
||
|
-# Check for Python 3
|
||
|
-#==============================================================================
|
||
|
-PY3 = sys.version_info[0] == 3
|
||
|
-
|
||
|
-
|
||
|
#==============================================================================
|
||
|
# Minimal Python version sanity check
|
||
|
# Taken from the notebook setup.py -- Modified BSD License
|
||
|
@@ -87,13 +80,8 @@ def get_subpackages(name):
|
||
|
def get_data_files():
|
||
|
"""Return data_files in a platform dependent manner"""
|
||
|
if sys.platform.startswith('linux'):
|
||
|
- if PY3:
|
||
|
- data_files = [('share/applications', ['scripts/spyder3.desktop']),
|
||
|
- ('share/icons', ['img_src/spyder3.png']),
|
||
|
- ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
|
||
|
- else:
|
||
|
- data_files = [('share/applications', ['scripts/spyder.desktop']),
|
||
|
- ('share/icons', ['img_src/spyder.png'])]
|
||
|
+ data_files = [('share/applications', ['scripts/spyder.desktop']),
|
||
4 years ago
|
+ ('share/icons', ['img_src/spyder.png'])]
|
||
4 years ago
|
elif os.name == 'nt':
|
||
|
data_files = [('scripts', ['img_src/spyder.ico',
|
||
|
'img_src/spyder_reset.ico'])]
|
||
4 years ago
|
@@ -131,9 +119,7 @@ CMDCLASS = {'install_data': MyInstallData}
|
||
4 years ago
|
# See spyder-ide/spyder#1158.
|
||
|
SCRIPTS = ['%s_win_post_install.py' % NAME]
|
||
4 years ago
|
|
||
4 years ago
|
-if PY3 and sys.platform.startswith('linux'):
|
||
|
- SCRIPTS.append('spyder3')
|
||
|
-else:
|
||
4 years ago
|
+if sys.platform.startswith('linux'):
|
||
|
SCRIPTS.append('spyder')
|
||
4 years ago
|
|
||
4 years ago
|
if os.name == 'nt':
|
||
|
@@ -269,8 +255,7 @@ if 'setuptools' in sys.modules:
|
||
4 years ago
|
|
||
|
setup_args['entry_points'] = {
|
||
|
'gui_scripts': [
|
||
|
- '{} = spyder.app.start:main'.format(
|
||
|
- 'spyder3' if PY3 else 'spyder')
|
||
|
+ '{} = spyder.app.start:main'.format('spyder')
|
||
|
]
|
||
|
}
|
||
|
|