From 8e38b6626be681adbb367820ce65e05254664629 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 8 May 2020 17:47:54 +0300 Subject: [PATCH] Remove deprecated --py36 option (#1236) --- .pre-commit-config.yaml | 2 +- README.md | 6 ------ black.py | 22 +--------------------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8bcc1be..1959390 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: additional_dependencies: [flake8-bugbear] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.740 + rev: v0.761 hooks: - id: mypy exclude: ^docs/conf.py diff --git a/README.md b/README.md index 43d47fc..def311f 100644 --- a/README.md +++ b/README.md @@ -71,12 +71,6 @@ Options: Python versions that should be supported by Black's output. [default: per-file auto- detection] - --py36 Allow using Python 3.6-only syntax on all - input files. This will put trailing commas - in function signatures and calls also after - *args and **kwargs. Deprecated; use - --target-version instead. [default: per-file - auto-detection] --pyi Format all input files like typing stubs regardless of file extension (useful when piping source on standard input). diff --git a/black.py b/black.py index 614fa8a..3ab4bc7 100644 --- a/black.py +++ b/black.py @@ -354,15 +354,6 @@ def target_version_option_callback( " auto-detection]" ), ) -@click.option( - "--py36", - is_flag=True, - help=( - "Allow using Python 3.6-only syntax on all input files. This will put trailing" - " commas in function signatures and calls also after *args and **kwargs." - " Deprecated; use --target-version instead. [default: per-file auto-detection]" - ), -) @click.option( "--pyi", is_flag=True, @@ -485,7 +476,6 @@ def main( color: bool, fast: bool, pyi: bool, - py36: bool, skip_string_normalization: bool, quiet: bool, verbose: bool, @@ -498,17 +488,7 @@ def main( """The uncompromising code formatter.""" write_back = WriteBack.from_configuration(check=check, diff=diff, color=color) if target_version: - if py36: - err("Cannot use both --target-version and --py36") - ctx.exit(2) - else: - versions = set(target_version) - elif py36: - err( - "--py36 is deprecated and will be removed in a future version. Use" - " --target-version py36 instead." - ) - versions = PY36_VERSIONS + versions = set(target_version) else: # We'll autodetect later. versions = set() -- 2.39.5