From b74cfd1f7ab5a82b2d0bf96f750998bc66324034 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 16 Feb 2014 18:44:37 -0500 Subject: Remove use of setuptools Feature. Fixes #23 --- setup.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index a5ca3ef..fcaeb12 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ import os import sys -from setuptools import setup, Extension, Feature +from setuptools import setup, Extension from distutils.command.build_ext import build_ext from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError @@ -13,14 +13,6 @@ is_jython = 'java' in sys.platform is_pypy = hasattr(sys, 'pypy_version_info') -speedups = Feature( - 'optional C speed-enhancement module', - standard=True, - ext_modules = [ - Extension('markupsafe._speedups', ['markupsafe/_speedups.c']), - ], -) - ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError) if sys.platform == 'win32' and sys.version_info > (2, 6): # 2.6's distutils.msvc9compiler can raise an IOError when failing to @@ -61,9 +53,8 @@ readme = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read() def run_setup(with_binary): - features = {} - if with_binary: - features['speedups'] = speedups + ext = Extension('markupsafe._speedups', ['markupsafe/_speedups.c']) + ext_modules = [ext] if with_binary else [] setup( name='MarkupSafe', version='0.18', @@ -90,7 +81,7 @@ def run_setup(with_binary): test_suite='markupsafe.tests.suite', include_package_data=True, cmdclass={'build_ext': ve_build_ext}, - features=features, + ext_modules=ext_modules, ) -- cgit v1.2.1