Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better error message for invalid exclude types #3764

Merged
merged 5 commits into from Jul 5, 2023
Merged

Better error message for invalid exclude types #3764

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fc77c9
Better error message for invalid exclude types
hauntsaninja Jul 5, 2023
03722a2
changelog
hauntsaninja Jul 5, 2023
32c42f6
lint
hauntsaninja Jul 5, 2023
df2c2c7
what is github doing???
hauntsaninja Jul 5, 2023
9f55e73
okay github seems to maybe work now
hauntsaninja Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Expand Up @@ -32,6 +32,8 @@
- `.pytest_cache`, `.ruff_cache` and `.vscode` are now excluded by default (#3691)
- Fix black not honouring `pyproject.toml` settings when running `--stdin-filename` and
the `pyproject.toml` found isn't in the current working directory (#3719)
- Black will now error if `exclude` and `extend-exclude` have invalid data types in
`pyproject.toml`, instead of silently doing the wrong thing.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
`pyproject.toml`, instead of silently doing the wrong thing.
`pyproject.toml`, instead of silently doing the wrong thing. (#3764)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Github is doing something really weird where the pushes show on the branch in my fork, but don't get reflected in the PR hauntsaninja@9f55e73

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah seems like there is something weird going on. In any case, this PR looks good once GitHub cooperates.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For whatever reason, the force in force push seems to wake it up. So I just need to commit an empty commit, push it, delete the commit and force push.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds like a great workflow


### Packaging

Expand Down
10 changes: 10 additions & 0 deletions src/black/__init__.py
View file
Open in desktop
Expand Up @@ -157,6 +157,16 @@ def read_pyproject_toml(
"target-version", "Config key target-version must be a list"
)

exclude = config.get("exclude")
if exclude is not None and not isinstance(exclude, str):
raise click.BadOptionUsage("exclude", "Config key exclude must be a string")

extend_exclude = config.get("extend_exclude")
if extend_exclude is not None and not isinstance(extend_exclude, str):
raise click.BadOptionUsage(
"extend-exclude", "Config key extend-exclude must be a string"
)

default_map: Dict[str, Any] = {}
if ctx.default_map:
default_map.update(ctx.default_map)
Expand Down