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

--HG--
branch : trunk

diff --git a/CHANGES b/CHANGES
index 5ad58e1991cb967963b893d9a75a3e9e7564d744..e31a32a8d00030fcde8b40a74285043a8bd60d1a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,14 @@
 Jinja2 Changelog
 ================
 
+Version 2.5.2
+-------------
+(bugfix release, released on August 18th 2010)
+
+- improved setup.py script to better work with assumptions people
+  might still have from it (``--with-speedups``).
+- fixed a packaging error that excluded the new debug support.
+
 Version 2.5.1
 -------------
 (bugfix release, released on August 17th 2010)

diff --git a/MANIFEST.in b/MANIFEST.in
index f593398bfaefe76b5c7ec232a474e6805df5cdf2..713f21a6f2d7cebadb61986542a3e1f64d40002d 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include MANIFEST.in Makefile CHANGES LICENSE AUTHORS jinja2/_speedups.c
+include MANIFEST.in Makefile CHANGES LICENSE AUTHORS jinja2/_debugsupport.c
 recursive-include docs *
 recursive-include custom_fixers *
 recursive-include ext *

diff --git a/setup.py b/setup.py
index cf915cc1d07205a8c6d87abffb146c33365b9f7b..ff07040aa79e556acbbe58e1713e42bcf37e2e3b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -62,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.6',
+    version='2.5.2',
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',