From c264aa3696c96847300734c42be0f63413d9087b Mon Sep 17 00:00:00 2001 From: jpy-git Date: Wed, 6 Apr 2022 11:21:00 +0100 Subject: [PATCH 1/2] Output python version and implementation as part of `--version` flag --- CHANGES.md | 2 ++ src/black/__init__.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 30c00566b3c..3bf481fb580 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -37,6 +37,8 @@ +- Output python version and implementation as part of `--version` flag (#2997) + ### Packaging diff --git a/src/black/__init__.py b/src/black/__init__.py index bdeb73273bc..9261e4871bb 100644 --- a/src/black/__init__.py +++ b/src/black/__init__.py @@ -10,6 +10,7 @@ import os from pathlib import Path from pathspec.patterns.gitwildmatch import GitWildMatchPatternError +import platform import re import signal import sys @@ -381,7 +382,10 @@ def validate_regex( ) @click.version_option( version=__version__, - message=f"%(prog)s, %(version)s (compiled: {'yes' if COMPILED else 'no'})", + message=( + f"%(prog)s, %(version)s (compiled: {'yes' if COMPILED else 'no'})\n" + f"python, {platform.python_version()} ({platform.python_implementation()})" + ), ) @click.argument( "src", From 5f9f579264aa674e1623aaedc81d4c26a3728058 Mon Sep 17 00:00:00 2001 From: Joe Young <80432516+jpy-git@users.noreply.github.com> Date: Wed, 6 Apr 2022 14:06:03 +0100 Subject: [PATCH 2/2] Stick implementation to Python in version message Co-authored-by: Batuhan Taskaya --- src/black/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/black/__init__.py b/src/black/__init__.py index 9261e4871bb..3a2d1cb8898 100644 --- a/src/black/__init__.py +++ b/src/black/__init__.py @@ -384,7 +384,7 @@ def validate_regex( version=__version__, message=( f"%(prog)s, %(version)s (compiled: {'yes' if COMPILED else 'no'})\n" - f"python, {platform.python_version()} ({platform.python_implementation()})" + f"Python ({platform.python_implementation()}) {platform.python_version()}" ), ) @click.argument(