diff -Nur spyder-2.2.1.orig/setup.py spyder-2.2.1/setup.py --- spyder-2.2.1.orig/setup.py 2013-07-18 09:06:57.658109133 -0700 +++ spyder-2.2.1/setup.py 2013-07-18 09:09:17.124019760 -0700 @@ -69,36 +69,6 @@ CMDCLASS = {'install_data': MyInstallData} -# Sphinx build (documentation) -try: - from sphinx import setup_command - - class MyBuild(build): - def has_doc(self): - setup_dir = os.path.dirname(os.path.abspath(__file__)) - return os.path.isdir(os.path.join(setup_dir, 'doc')) - sub_commands = build.sub_commands + [('build_doc', has_doc)] - CMDCLASS['build'] = MyBuild - class MyBuildDoc(setup_command.BuildDoc): - def run(self): - build = self.get_finalized_command('build') - sys.path.insert(0, os.path.abspath(build.build_lib)) - dirname = self.distribution.get_command_obj('build').build_purelib - self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc') - try: - setup_command.BuildDoc.run(self) - except UnicodeDecodeError: - print("ERROR: unable to build documentation because Sphinx "\ - "do not handle source path with non-ASCII characters. "\ - "Please try to move the source package to another "\ - "location (path with *only* ASCII characters).", - file=sys.stderr) - sys.path.pop(0) - CMDCLASS['build_doc'] = MyBuildDoc -except ImportError: - print('WARNING: unable to build documentation because Sphinx '\ - 'is not installed', file=sys.stderr) - NAME = 'spyder' LIBNAME = 'spyderlib' @@ -164,7 +134,7 @@ package_data={LIBNAME: get_package_data(LIBNAME, EXTLIST), 'spyderplugins': get_package_data('spyderplugins', EXTLIST)}, - requires=["rope (>=0.9.2)", "sphinx (>=0.6.0)", "PyQt4 (>=4.4)"], + requires=["rope (>=0.9.2)", "PyQt4 (>=4.4)"], scripts=[osp.join('scripts', fname) for fname in SCRIPTS], data_files=get_data_files(), options={"bdist_wininst": @@ -185,5 +155,5 @@ 'Programming Language :: Python :: 2.7', 'Development Status :: 5 - Production/Stable', 'Topic :: Scientific/Engineering', - 'Topic :: Software Development :: Widget Sets'], - cmdclass=CMDCLASS) + 'Topic :: Software Development :: Widget Sets']) +