Merge branch 'master' of http://github.com/mitsuhiko/flask

extreview/approved.rst

@@ -11,8 +11,8 @@ Flask-Babel
 
 :First Approval: 2010-07-23
 :Last Review: 2010-07-23
-:Approved version: 0.6
+:Approved Version: 0.6
-:Approved license: BSD
+:Approved License: BSD
 
 Notes: Developed by the Flask development head
 
@@ -24,9 +24,21 @@ Flask-SQLAlchemy
 
 :First Approval: 2010-07-25
 :Last Review: 2010-07-25
-:Approved version: 0.9
+:Approved Version: 0.9.1
-:Approved license: BSD
+:Approved License: BSD
 
 Notes: Developed by the Flask development head
 
 How to improve: add a better long description to the next release
+
+
+Flask-Creole
+------------
+
+:First Approval: 2010-07-25
+:Last Review: 2010-07-25
+:Approved Version: 0.4.4
+:Approved License: BSD
+
+Notes: Flask-Markdown and this should share API, consider that when
+approving Flask-Markdown

extreview/listed.rst

@@ -28,18 +28,6 @@ package (missing entry in MANIFEST.in) and the test suite does not respond
 to either "make test" or "python setup.py test".
 
 
-Flask-Creole
-------------
-
-:Last-Review: 2010-07-25
-:Reviewed Version: 0.2
-
-Would be fine for approval, but the test suite is not part of the sdist
-package (missing entry in MANIFEST.in) and the test suite does not respond
-to either "make test" or "python setup.py test".  Furthermore the README
-file is empty.
-
-
 flask-csrf
 ----------
 

extreview/unlisted.rst

@@ -10,7 +10,7 @@ Flask-Actions
 -------------
 
 :Last Review: 2010-07-25
-:Reviewed version: 0.2
+:Reviewed Version: 0.2
 
 Rejected because of missing description in PyPI, formatting issues with
 the documentation (missing headlines, scrollbars etc.) and a general clash
@@ -26,7 +26,7 @@ Flask-Jinja2Extender
 --------------------
 
 :Last Review: 2010-07-25
-:Reviewed version: 0.1
+:Reviewed Version: 0.1
 
 Usecase not obvious, hacky implementation, does not solve a problem that
 could not be solved with Flask itself.  I suppose it is to aid other
@@ -37,7 +37,7 @@ Flask-Markdown
 --------------
 
 :Last Review: 2010-07-25
-:Reviewed version: 0.2
+:Reviewed Version: 0.2
 
 Would be great for enlisting but it should follow the API of Flask-Creole.
 Besides that, the docstrings are not valid rst (run through rst2html to
@@ -48,7 +48,7 @@ flask-urls
 ----------
 
 :Last Review: 2010-07-25
-:Reviewed version: 0.9.2
+:Reviewed Version: 0.9.2
 
 Broken PyPI index and non-conforming extension name.  Due to the small
 featureset this was also delisted from the list.  It was there previously

tests/flaskext_test.py

@@ -216,13 +216,22 @@ def test_extension(name, interpreters, flask_dep):
     # figure out the test command and write a wrapper script.  We
     # can't write that directly into the tox ini because tox does
     # not invoke the command from the shell so we have no chance
-    # to pipe the output into a logfile
+    # to pipe the output into a logfile.  The /dev/null hack is
+    # to trick py.test (if used) into not guessing widths from the
+    # invoking terminal.
     test_command = get_test_command(checkout_path)
     log('Test command: %s', test_command)
     f = open(checkout_path + '/flaskext-runtest.sh', 'w')
-    f.write(test_command + ' &> "$1"\n')
+    f.write(test_command + ' &> "$1" < /dev/null\n')
     f.close()
 
+    # if there is a tox.ini, remove it, it will cause troubles
+    # for us.  Remove it if present, we are running tox ourselves
+    # afterall.
+    toxini = os.path.join(checkout_path, 'tox.ini')
+    if os.path.isfile(toxini):
+        os.remove(toxini)
+
     create_tox_ini(checkout_path, interpreters, flask_dep)
     rv = subprocess.call(['tox'], cwd=checkout_path)
     return TestResult(name, checkout_path, rv, interpreters)