Remove deprecated --py36 option (#1236)

This commit is contained in:
Hugo van Kemenade 2020-05-08 17:47:54 +03:00 committed by GitHub
parent 89c87d22e7
commit 8e38b6626b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 28 deletions

View File

@ -18,7 +18,7 @@ repos:
additional_dependencies: [flake8-bugbear] additional_dependencies: [flake8-bugbear]
- repo: https://github.com/pre-commit/mirrors-mypy - repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.740 rev: v0.761
hooks: hooks:
- id: mypy - id: mypy
exclude: ^docs/conf.py exclude: ^docs/conf.py

View File

@ -71,12 +71,6 @@ Options:
Python versions that should be supported by Python versions that should be supported by
Black's output. [default: per-file auto- Black's output. [default: per-file auto-
detection] 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 --pyi Format all input files like typing stubs
regardless of file extension (useful when regardless of file extension (useful when
piping source on standard input). piping source on standard input).

View File

@ -354,15 +354,6 @@ def target_version_option_callback(
" auto-detection]" " 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( @click.option(
"--pyi", "--pyi",
is_flag=True, is_flag=True,
@ -485,7 +476,6 @@ def main(
color: bool, color: bool,
fast: bool, fast: bool,
pyi: bool, pyi: bool,
py36: bool,
skip_string_normalization: bool, skip_string_normalization: bool,
quiet: bool, quiet: bool,
verbose: bool, verbose: bool,
@ -498,17 +488,7 @@ def main(
"""The uncompromising code formatter.""" """The uncompromising code formatter."""
write_back = WriteBack.from_configuration(check=check, diff=diff, color=color) write_back = WriteBack.from_configuration(check=check, diff=diff, color=color)
if target_version: if target_version:
if py36:
err("Cannot use both --target-version and --py36")
ctx.exit(2)
else:
versions = set(target_version) 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
else: else:
# We'll autodetect later. # We'll autodetect later.
versions = set() versions = set()