Release 0.10.1

This reverts commit 45b70c952f.
This commit broke the readthedocs build because RTD is building the docs
without running setup.py. So there is no package metadata.

.travis.yml

@@ -1,9 +1,9 @@
+sudo: false
 language: python
-python: "2.7"
+python: "3.6"
 env:
-  - TOXENV=py26
   - TOXENV=py27
-  - TOXENV=py33
+  - TOXENV=py36
 install:
-  - pip install tox --use-mirrors
+  - pip install tox
 script: tox

CHANGES.rst

@@ -1,6 +1,17 @@
 Changes
 =======
 
+0.10.1 (2017-02-12)
+-------------------
+
+Enhancements:
+- Add support for Python wheels
+
+Fixes:
+
+- Switch imports from deprecated flask.ext.* to flask_* syntax (#94, thanks
+  Michael Lenzen & #97 thanks Iuri de Silvio)
+
 0.10.0 (2015-04-17)
 -------------------
 

MANIFEST.in

@@ -1,2 +1,3 @@
+include LICENSE
 recursive-include flask_debugtoolbar/templates *.html
 recursive-include flask_debugtoolbar/static *

README.rst

@@ -40,4 +40,4 @@ In production, setting ``app.debug = False`` will disable the toolbar.
 
 See the `documentation`_ for more information.
 
-.. _documentation: http://flask-debugtoolbar.readthedocs.org
+.. _documentation: https://flask-debugtoolbar.readthedocs.io/

docs/conf.py

@@ -11,7 +11,13 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import datetime
+import os
+import sys
+import time
+
+
+BUILD_DATE = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -44,7 +50,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Flask-DebugToolbar'
-copyright = u'2012-2015'
+copyright = u'2012-{0}'.format(BUILD_DATE.year)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -53,7 +59,7 @@ copyright = u'2012-2015'
 # The short X.Y version.
 version = '0.10'
 # The full version, including alpha/beta/rc tags.
-release = '0.10.0'
+release = '0.10.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -90,7 +96,7 @@ pygments_style = 'sphinx'
 #modindex_common_prefix = []
 
 intersphinx_mapping = {
-    'flasksqlalchemy': ('http://flask-sqlalchemy.pocoo.org/2.0/', None)
+    'flasksqlalchemy': ('http://flask-sqlalchemy.pocoo.org/latest/', None)
 }
 
 

docs/panels.rst

@@ -70,7 +70,7 @@ Shows SQL queries run during the current request.
    :ref:`flasksqlalchemy:quickstart` section to configure it.
 
    For additional details on query recording see the
-   :py:func:`~flask.ext.sqlalchemy.get_debug_queries` documentation.
+   :py:func:`~flask_sqlalchemy.get_debug_queries` documentation.
 
 .. image:: _static/screenshot-sqlalchemy-panel.png
 

example/example.py

@@ -2,8 +2,8 @@ import sys
 sys.path.insert(0, '.')
 
 from flask import Flask, render_template, redirect, url_for
-from flask.ext.script import Manager
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_script import Manager
+from flask_sqlalchemy import SQLAlchemy
 from flask_debugtoolbar import DebugToolbarExtension
 
 

flask_debugtoolbar/panels/sqlalchemy.py

@@ -1,5 +1,5 @@
 try:
-    from flask.ext.sqlalchemy import get_debug_queries, SQLAlchemy
+    from flask_sqlalchemy import get_debug_queries, SQLAlchemy
 except ImportError:
     sqlalchemy_available = False
     get_debug_queries = SQLAlchemy = None

flask_debugtoolbar/templates/panels/sqlalchemy_error.html

@@ -25,7 +25,7 @@
     <h5>Configure Flask-SQLAlchemy:</h5>
     <p>
       The Flask-SQLAlchemy extension needs to be configured for this application.
-      Please see the <a href="http://flask-sqlalchemy.pocoo.org/2.0/quickstart/">
+      Please see the <a href="http://flask-sqlalchemy.pocoo.org/latest/quickstart/">
       Flask-SQLAlchemy documentation</a> for details.
     </p>
   </li>
@@ -40,10 +40,10 @@
     <pre>app.config['SQLALCHEMY_RECORD_QUERIES'] = True</pre>
     <p>
       See the
-      <a href="http://flask-sqlalchemy.pocoo.org/2.0/api/#flask.ext.sqlalchemy.get_debug_queries">
+      <a href="http://flask-sqlalchemy.pocoo.org/latest/api/#flask.ext.sqlalchemy.get_debug_queries">
         documention of Flask-SQLAlchemy's <code>get_debug_queries()</code></a>
       for additional details.
     </p>
   </li>
   {% endif %}
-</ol>
+</ol>

flask_debugtoolbar/utils.py

@@ -18,7 +18,6 @@ try:
 except ImportError:
     HAVE_SQLPARSE = False
 
-
 from flask import current_app, Markup
 
 

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1

setup.py

@@ -1,5 +1,5 @@
 import os
-from setuptools import setup, find_packages
+from setuptools import setup
 
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -14,8 +14,8 @@ except:
 
 setup(
     name='Flask-DebugToolbar',
-    version='0.10.0',
-    url='http://flask-debugtoolbar.rtfd.org/',
+    version='0.10.1',
+    url='https://flask-debugtoolbar.readthedocs.io/',
     license='BSD',
     author='Michael van Tellingen',
     author_email='michaelvantellingen@gmail.com',

test/basic_app.py

@@ -1,7 +1,9 @@
 from flask import Flask, render_template
-from flask_debugtoolbar import DebugToolbarExtension
 from flask_sqlalchemy import SQLAlchemy
 
+from flask_debugtoolbar import DebugToolbarExtension
+
+
 app = Flask('basic_app')
 app.debug = True
 app.config['SECRET_KEY'] = 'abc123'

test/test_utils.py

@@ -1,9 +1,8 @@
-import pytest
-
-import posixpath
 import ntpath
+import posixpath
 
 from flask import Markup
+import pytest
 
 from flask_debugtoolbar.utils import (_relative_paths, _shortest_relative_path,
                                       format_sql, decode_text, HAVE_PYGMENTS)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py34,stylecheck
+envlist = py27,py36,stylecheck
 
 [testenv]
 deps =