Preparing for a 2.5.2 release. Fixed an issue with setup.py

[jinja2.git] / setup.py

diff --git a/setup.py b/setup.py
index 154810fc99a97b7f811bbb95a046fdb852a06c89..ff07040aa79e556acbbe58e1713e42bcf37e2e3b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,16 @@ import os
 import sys
 
 from setuptools import setup, Extension, Feature
+from distutils.command.build_ext import build_ext
+
+debugsupport = Feature(
+    'optional C debug support',
+    standard=False,
+    ext_modules = [
+        Extension('jinja2._debugsupport', ['jinja2/_debugsupport.c']),
+    ],
+)
+
 
 # tell distribute to use 2to3 with our own fixers.
 extra = {}
@@ -52,10 +62,21 @@ if sys.version_info >= (3, 0):
         use_2to3_fixers=['custom_fixers']
     )
 
+# ignore the old '--with-speedups' flag
+try:
+    speedups_pos = sys.argv.index('--with-speedups')
+except IndexError:
+    pass
+else:
+    sys.argv[speedups_pos] = '--with-debugsupport'
+    print >> sys.stderr, 'the --with-speedups flag is deprecated'
+    print >> sys.stderr, 'assuming --with-debugsupport'
+    print >> sys.stderr, 'for speedups install MarkupSafe'
+
 
 setup(
     name='Jinja2',
-    version='2.3.1',
+    version='2.5.2',
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',
@@ -77,15 +98,8 @@ setup(
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Text Processing :: Markup :: HTML'
     ],
-    packages=['jinja2', 'jinja2.testsuite', 'jinja2.testsuite.res'],
-    features={
-        'speedups': Feature("optional C speed-enhancements",
-            standard=False,
-            ext_modules=[
-                Extension('jinja2._speedups', ['jinja2/_speedups.c'])
-            ]
-        )
-    },
+    packages=['jinja2', 'jinja2.testsuite', 'jinja2.testsuite.res',
+              'jinja2._markupsafe'],
     extras_require={'i18n': ['Babel>=0.8']},
     test_suite='jinja2.testsuite.suite',
     include_package_data=True,
@@ -93,5 +107,6 @@ setup(
     [babel.extractors]
     jinja2 = jinja2.ext:babel_extract[i18n]
     """,
+    features={'debugsupport': debugsupport},
     **extra
 )