Skip to content

Revert adding toml and jupyter#45

Merged
charliermarsh merged 3 commits intoastral-sh:mainfrom
hamdanal:patch-1
Jul 10, 2023
Merged

Revert adding toml and jupyter#45
charliermarsh merged 3 commits intoastral-sh:mainfrom
hamdanal:patch-1

Conversation

@hamdanal
Copy link
Copy Markdown
Contributor

@hamdanal hamdanal commented Jul 10, 2023

@hamdanal hamdanal changed the title Revert adding toml Revert adding toml and jupyter Jul 10, 2023
@charliermarsh charliermarsh merged commit d87e2b0 into astral-sh:main Jul 10, 2023
@hamdanal hamdanal deleted the patch-1 branch July 10, 2023 19:06
dhruvmanila added a commit to astral-sh/ruff that referenced this pull request Jul 10, 2023
charliermarsh added a commit to astral-sh/ruff that referenced this pull request Aug 28, 2023
## Summary

This PR adds a higher-level enum (`SourceType`) around `PySourceType` to
allow us to use the same detection path to handle TOML files. Right now,
we have ad hoc `is_pyproject_toml` checks littered around, and some
codepaths are omitting that logic altogether (like `add_noqa`). Instead,
we should always be required to check the source type and handle TOML
files as appropriate.

This PR will also help with our pre-commit capabilities. If we add
`toml` to pre-commit (to support `pyproject.toml`), pre-commit will
start to pass _other_ files to Ruff (along with `poetry.lock` and
`Pipfile` -- see
[identify](https://github.com/pre-commit/identify/blob/b59996304fea80025d32abc3ac8f7212a9e7380d/identify/extensions.py#L355)).
By detecting those files and handling those cases, we avoid attempting
to parse them as Python files, which would lead to pre-commit errors.
(We tried to add `toml` to pre-commit here
(astral-sh/ruff-pre-commit#44), but had to
revert here (astral-sh/ruff-pre-commit#45) as it
led to the pre-commit hook attempting to parse `poetry.lock` files as
Python files.)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants