Unverified Commit 8e38b662 authored by Hugo van Kemenade's avatar Hugo van Kemenade Committed by GitHub
Browse files

Remove deprecated --py36 option (#1236)

parent 89c87d22
Loading
Loading
Loading
Loading
+1 −1
Changes for .pre-commit-config.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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
+0 −6
Changes for README.md: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -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).
+0 −20
Changes for black.py: 0 added lines, 20 removed lines.
Original line number Diff line number Diff line
@@ -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
    else:
        # We'll autodetect later.
        versions = set()