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.

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

Remove extra line after imports in conf.py #147

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Conversation

Avasam
Copy link
Contributor

@Avasam Avasam commented Sep 11, 2024

This change fixes an incompatibility (and source of merge conflicts) with projects using Ruff/isort.

I could add the I (https://docs.astral.sh/ruff/rules/#isort-i) category to the Ruff configs (see example from https://github.com/pypa/setuptools/blob/962835d068af4d993f2195e7a6ffd4f70548b9f4/ruff.toml#L60-L62 ). But it would create more conflicts with ongoing #143 .
But at the same time, a lot of those PRs already have conflicts from changes in mypy.ini and conf.py, and import-related conflicts are easy to fix (accept both + rerun fixer). So maybe now's not a bad time to add it before I fix conflicts.

This change fixes an incompatibility (and source of merge conflicts) with projects using Ruff/isort.
@jaraco jaraco merged commit 81b766c into jaraco:main Sep 11, 2024
12 of 14 checks passed
@Avasam Avasam deleted the patch-3 branch September 11, 2024 22:30
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