Skip to content

Commit

Permalink
Add option to require a specific version to be running (#2300)
Browse files Browse the repository at this point in the history
Closes #1246: This PR adds a new option (and automatically a toml entry, hooray for existing configuration management πŸŽ‰) to require a specific version of Black to be running.

For example: `black --required-version 20.8b -c "format = 'this'"`

Execution fails straight away if it doesn't match `__version__`.
  • Loading branch information
felix-hilden committed Jun 3, 2021
1 parent df1c86c commit a2b5ba2
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -7,6 +7,7 @@
- Correct max string length calculation when there are string operators (#2292)
- Fixed option usage when using the `--code` flag (#2259)
- Do not call `uvloop.install()` when _Black_ is used as a library (#2303)
- Added `--required-version` option to require a specific version to be running (#2300)

## 21.5b2

Expand Down
15 changes: 14 additions & 1 deletion docs/usage_and_configuration/the_basics.md
Expand Up @@ -167,7 +167,7 @@ $ black src/ -q
error: cannot format src/black_primer/cli.py: Cannot parse: 5:6: mport asyncio
```

### Getting the version
### Versions

You can check the version of _Black_ you have installed using the `--version` flag.

Expand All @@ -176,6 +176,19 @@ $ black --version
black, version 21.5b0
```

An option to require a specific version to be running is also provided.

```console
$ black --required-version 21.5b2 -c "format = 'this'"
format = "this"
$ black --required-version 31.5b2 -c "still = 'beta?!'"
Oh no! πŸ’₯ πŸ’” πŸ’₯ The required version does not match the running version!
```

This is useful for example when running _Black_ in multiple environments that haven't
necessarily installed the correct version. This option can be set in a configuration
file for consistent results across environments.

## Configuration via a file

_Black_ is able to read project-specific default values for its command line options
Expand Down
26 changes: 22 additions & 4 deletions src/black/__init__.py
Expand Up @@ -241,6 +241,14 @@ def validate_regex(
is_flag=True,
help="If --fast given, skip temporary sanity checks. [default: --safe]",
)
@click.option(
"--required-version",
type=str,
help=(
"Require a specific version of Black to be running (useful for unifying results"
" across many environments e.g. with a pyproject.toml file)."
),
)
@click.option(
"--include",
type=str,
Expand Down Expand Up @@ -351,6 +359,7 @@ def main(
experimental_string_processing: bool,
quiet: bool,
verbose: bool,
required_version: str,
include: Pattern,
exclude: Optional[Pattern],
extend_exclude: Optional[Pattern],
Expand All @@ -360,6 +369,17 @@ def main(
config: Optional[str],
) -> None:
"""The uncompromising code formatter."""
if config and verbose:
out(f"Using configuration from {config}.", bold=False, fg="blue")

error_msg = "Oh no! πŸ’₯ πŸ’” πŸ’₯"
if required_version and required_version != __version__:
err(
f"{error_msg} The required version `{required_version}` does not match"
f" the running version `{__version__}`!"
)
ctx.exit(1)

write_back = WriteBack.from_configuration(check=check, diff=diff, color=color)
if target_version:
versions = set(target_version)
Expand All @@ -374,8 +394,6 @@ def main(
magic_trailing_comma=not skip_magic_trailing_comma,
experimental_string_processing=experimental_string_processing,
)
if config and verbose:
out(f"Using configuration from {config}.", bold=False, fg="blue")

if code is not None:
# Run in quiet mode by default with -c; the extra output isn't useful.
Expand Down Expand Up @@ -428,9 +446,9 @@ def main(
)

if verbose or not quiet:
out("Oh no! πŸ’₯ πŸ’” πŸ’₯" if report.return_code else "All done! ✨ 🍰 ✨")
out(error_msg if report.return_code else "All done! ✨ 🍰 ✨")
if code is None:
click.secho(str(report), err=True)
click.echo(str(report), err=True)
ctx.exit(report.return_code)


Expand Down
10 changes: 10 additions & 0 deletions tests/test_black.py
Expand Up @@ -1796,6 +1796,16 @@ def test_invalid_cli_regex(self) -> None:
for option in ["--include", "--exclude", "--extend-exclude", "--force-exclude"]:
self.invokeBlack(["-", option, "**()(!!*)"], exit_code=2)

def test_required_version_matches_version(self) -> None:
self.invokeBlack(
["--required-version", black.__version__], exit_code=0, ignore_config=True
)

def test_required_version_does_not_match_version(self) -> None:
self.invokeBlack(
["--required-version", "20.99b"], exit_code=1, ignore_config=True
)

def test_preserves_line_endings(self) -> None:
with TemporaryDirectory() as workspace:
test_file = Path(workspace) / "test.py"
Expand Down

0 comments on commit a2b5ba2

Please sign in to comment.