mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-04-12 14:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'winsetup' (PR #536)

Browse Source 
introduces install dependency of setuptools on Windows

This is a temporary fix, and the setuptools dependency should
be removed in 0.12.

closes gh-536
closes gh-351
closes gh-369
This commit is contained in:
MinRK 2011-06-24 16:54:29 -07:00
commit 4166074803
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup.py
View File

@ -198,10 +198,18 @@ data_files = find_data_files()
# For some commands, use setuptools. Note that we do NOT list install here!
# If you want a setuptools-enhanced install, just run 'setupegg.py install'
if len(set(('develop', 'sdist', 'release', 'bdist_egg', 'bdist_rpm',
needs_setuptools = set(('develop', 'sdist', 'release', 'bdist_egg', 'bdist_rpm',
'bdist', 'bdist_dumb', 'bdist_wininst', 'install_egg_info',
'build_sphinx', 'egg_info', 'easy_install', 'upload',
)).intersection(sys.argv)) > 0:
))
if sys.platform == 'win32':
# Depend on setuptools for install on *Windows only*
# If we get script-installation working without setuptools,
# then we can back off, but until then use it.
# See Issue #369 on GitHub for more
needs_setuptools.add('install')
if len(needs_setuptools.intersection(sys.argv)) > 0:
import setuptools
# This dict is used for passing extra arguments that are setuptools