diff options
author | Armin Ronacher <armin.ronacher@active-4.com> | 2016-01-13 22:32:36 +0100 |
---|---|---|
committer | Armin Ronacher <armin.ronacher@active-4.com> | 2016-01-13 22:32:36 +0100 |
commit | d2001bb66b05badc7ac82722e17ddb0e1e81250a (patch) | |
tree | 0b93a37b2713a40130225a0d305ba847aa054425 | |
parent | 3daebaa27e011ef53bcd8ae90c1d15fc6bc36a50 (diff) | |
parent | 0ad6290c19867a300a27e9a0dd9f74d411f103af (diff) | |
download | markupsafe-d2001bb66b05badc7ac82722e17ddb0e1e81250a.tar.gz |
Merge pull request #43 from gtback/restore-speedups-feature
Restore speedups feature
-rw-r--r-- | setup.py | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -1,6 +1,6 @@ import os import sys -from setuptools import setup, Extension +from setuptools import setup, Extension, Feature from distutils.command.build_ext import build_ext from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError @@ -13,14 +13,13 @@ is_jython = 'java' in sys.platform is_pypy = hasattr(sys, 'pypy_version_info') -# Remove old arguments that were once supported. Thanks setuptools -# 3.0 for just randomly removing functionality. -for arg in '--with-speedups', '--without-speedups': - try: - sys.argv.remove(arg) - except ValueError: - pass - +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): @@ -62,8 +61,9 @@ readme = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read() def run_setup(with_binary): - ext = Extension('markupsafe._speedups', ['markupsafe/_speedups.c']) - ext_modules = [ext] if with_binary else [] + features = {} + if with_binary: + features['speedups'] = speedups setup( name='MarkupSafe', version='0.23', @@ -90,7 +90,7 @@ def run_setup(with_binary): test_suite='markupsafe.tests.suite', include_package_data=True, cmdclass={'build_ext': ve_build_ext}, - ext_modules=ext_modules, + features=features, ) |