Merge branch '1.0-maintenance'

This commit is contained in:
David Lord 2019-01-06 16:33:17 -08:00
commit 4f3dbb3f3b
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
3 changed files with 19 additions and 8 deletions

View file

@ -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_version': sys.version,
'python': platform.python_version(),
'flask': __version__,
'werkzeug': werkzeug.__version__,
}, color=ctx.color)
ctx.exit()