diff --git a/.travis.yml b/.travis.yml index f89e332..61c1d2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,41 @@ language: python +dist: + - bionic + - xenial python: - - "3.5" - - "3.4" - - "3.3" - "2.7" - - "2.6" + - "3.5" + - "3.6" + - "3.7" + - "3.8" env: - - FLASK=0.11.1 - - FLASK=0.10.1 - - FLASK=0.9 - - FLASK=0.8.1 + - FLASK=1.1.1 WERKZEUG=1.0.0 + - FLASK=1.0.4 WERKZEUG=1.0.0 + - FLASK=0.12.5 WERKZEUG=0.16.1 + - FLASK=0.11.1 WERKZEUG=0.16.1 + - FLASK=0.10.1 WERKZEUG=0.16.1 + - FLASK=0.9 WERKZEUG=0.16.1 + - FLASK=0.8.1 WERKZEUG=0.16.1 matrix: exclude: - - python: "3.3" - env: FLASK=0.9 - - python: "3.3" - env: FLASK=0.8.1 - - python: "3.4" - env: FLASK=0.9 - - python: "3.4" - env: FLASK=0.8.1 - python: "3.5" - env: FLASK=0.9 + env: FLASK=0.9 WERKZEUG=0.16.1 - python: "3.5" - env: FLASK=0.8.1 + env: FLASK=0.8.1 WERKZEUG=0.16.1 + - python: "3.6" + env: FLASK=0.9 WERKZEUG=0.16.1 + - python: "3.6" + env: FLASK=0.8.1 WERKZEUG=0.16.1 + - python: "3.7" + env: FLASK=0.9 WERKZEUG=0.16.1 + - python: "3.7" + env: FLASK=0.8.1 WERKZEUG=0.16.1 + - python: "3.8" + env: FLASK=0.9 WERKZEUG=0.16.1 + - python: "3.8" + env: FLASK=0.8.1 WERKZEUG=0.16.1 install: - - pip install flask==$FLASK coverage + - pip install werkzeug==$WERKZEUG flask==$FLASK coverage - pip install -e . script: - python setup.py test @@ -33,3 +43,4 @@ notifications: email: - christoph.heer@googlemail.com - jonathan.como@gmail.com +version: ~> 1.0 diff --git a/flask_testing/utils.py b/flask_testing/utils.py index 7362c40..4a24e69 100644 --- a/flask_testing/utils.py +++ b/flask_testing/utils.py @@ -32,7 +32,7 @@ # Python 2 urlparse fallback from urlparse import urlparse, urljoin -from werkzeug import cached_property +from werkzeug.utils import cached_property # Use Flask's preferred JSON module so that our runtime behavior matches. from flask import json_available, templating, template_rendered diff --git a/tests/flask_app/__init__.py b/tests/flask_app/__init__.py index 7ddd94e..6c93683 100644 --- a/tests/flask_app/__init__.py +++ b/tests/flask_app/__init__.py @@ -48,7 +48,7 @@ def redirect_to_flask_docs(): @app.route("/ajax/") def ajax(): - return jsonify(name="test") + return jsonify(**dict(name="test")) @app.route("/forbidden/") def forbidden():