Remove deprecated --py36 option (#1236)
This commit is contained in:
parent
89c87d22e7
commit
8e38b6626b
@ -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
|
||||
|
@ -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).
|
||||
|
22
black.py
22
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()
|
||||
|
Loading…
Reference in New Issue
Block a user