Merge branch '1.0-maintenance'

CHANGES.rst

@@ -33,9 +33,12 @@ Unreleased
     stricter about header encodings than PEP 3333. (`#2766`_)
 -   Allow custom CLIs using ``FlaskGroup`` to set the debug flag without
     it always being overwritten based on environment variables. (`#2765`_)
+-   ``flask --version`` outputs Werkzeug's version and simplifies the
+    Python version. (`#2825`_)
 
 .. _#2766: https://github.com/pallets/flask/issues/2766
 .. _#2765: https://github.com/pallets/flask/pull/2765
+.. _#2825: https://github.com/pallets/flask/pull/2825
 
 
 Version 1.0.2

flask/cli.py

@@ -14,6 +14,7 @@ from __future__ import print_function
 import ast
 import inspect
 import os
+import platform
 import re
 import ssl
 import sys
@@ -260,10 +261,16 @@ def locate_app(script_info, module_name, app_name, raise_if_not_found=True):
 def get_version(ctx, param, value):
     if not value or ctx.resilient_parsing:
         return
-    message = 'Flask %(version)s\nPython %(python_version)s'
+    import werkzeug
+    message = (
+        'Python %(python)s\n'
+        'Flask %(flask)s\n'
+        'Werkzeug %(werkzeug)s'
+    )
     click.echo(message % {
-        'version': __version__,
+        'python': platform.python_version(),
-        'python_version': sys.version,
+        'flask': __version__,
+        'werkzeug': werkzeug.__version__,
     }, color=ctx.color)
     ctx.exit()
 

tests/test_cli.py

@@ -241,9 +241,9 @@ def test_locate_app_suppress_raise():
 
 
 def test_get_version(test_apps, capsys):
-    """Test of get_version."""
+    from flask import __version__ as flask_version
-    from flask import __version__ as flask_ver
+    from werkzeug import __version__ as werkzeug_version
-    from sys import version as py_ver
+    from platform import python_version
 
     class MockCtx(object):
         resilient_parsing = False
@@ -254,8 +254,9 @@ def test_get_version(test_apps, capsys):
     ctx = MockCtx()
     get_version(ctx, None, "test")
     out, err = capsys.readouterr()
-    assert flask_ver in out
+    assert "Python " + python_version() in out
-    assert py_ver in out
+    assert "Flask " + flask_version in out
+    assert "Werkzeug " + werkzeug_version in out
 
 
 def test_scriptinfo(test_apps, monkeypatch):