Skip to content

MNT git ignore recent black/ruff updates #31026

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
Merged
merged 1 commit into from
Apr 16, 2025
Merged

MNT git ignore recent black/ruff updates #31026

merged 1 commit into from
Apr 16, 2025

Conversation

DimitriPapadopoulos
Copy link
Contributor

@DimitriPapadopoulos DimitriPapadopoulos commented Mar 19, 2025 •
edited by lesteve
Loading

Reference Issues/PRs

What does this implement/fix? Explain your changes.

Ignore these commits:

  • fe7c417 Enforce ruff rules (RUF)
  • 5cdbbf1 Apply ruff/flake8-implicit-str-concat rules (ISC)
  • ff78e25 black → ruff format

Any other comments?

@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 19, 2025 •
edited
Loading

✔️ Linting Passed

All linting checks passed. Your pull request is in excellent shape! ☀️

Generated for commit: c256a3d. Link to the linter CI: here

@DimitriPapadopoulos DimitriPapadopoulos mentioned this pull request Mar 19, 2025
Closed
ogrisel
ogrisel approved these changes Mar 21, 2025
View reviewed changes
Copy link
Member

@ogrisel ogrisel left a comment

Choose a reason for hiding this comment

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

Thanks!

@DimitriPapadopoulos DimitriPapadopoulos marked this pull request as ready for review April 15, 2025 09:05
@DimitriPapadopoulos
Copy link
Contributor Author

DimitriPapadopoulos commented Apr 15, 2025 •
edited
Loading

I suggest merging this PR without waiting for #31015 - it might take some time to get it approved.

EDIT: #31015 merged after all.

@DimitriPapadopoulos DimitriPapadopoulos force-pushed the git-blame-ignore branch 3 times, most recently from c44f08c to 67cea87 Compare April 15, 2025 11:40
@DimitriPapadopoulos
Copy link
Contributor Author

The linter error is unrelated:

Traceback (most recent call last):
  File "/opt/hostedtoolcache/Python/3.11.11/x64/lib/python3.11/importlib/metadata/__init__.py", line 563, in from_name
    return next(cls.discover(name=name))
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
StopIteration

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/opt/hostedtoolcache/Python/3.11.11/x64/lib/python3.11/importlib/metadata/__init__.py", line 1009, in version
    return distribution(distribution_name).version
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/hostedtoolcache/Python/3.11.11/x64/lib/python3.11/importlib/metadata/__init__.py", line 982, in distribution
    return Distribution.from_name(distribution_name)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/hostedtoolcache/Python/3.11.11/x64/lib/python3.11/importlib/metadata/__init__.py", line [56](https://github.com/scikit-learn/scikit-learn/actions/runs/14468503819/job/40576350917?pr=31026#step:4:57)5, in from_name
    raise PackageNotFoundError(name)
importlib.metadata.PackageNotFoundError: No package metadata was found for cython-lint

I'll fix it in a different PR.

@lesteve
Copy link
Member

lesteve commented Apr 15, 2025 •
edited
Loading

I'll fix it in a different PR.

This affects all the PRs unfortunately after #31015 was merged 😓.

Can you open a PR adding cython-lint to pip install in

scikit-learn/.github/workflows/lint.yml

Line 37 in ff78e25

pip install pytest $(get_dep ruff min) $(get_dep mypy min)

I think that should fix it and this way I am able to merge it quickly 🙏

@DimitriPapadopoulos
Copy link
Contributor Author

@lesteve See #31208.

@lesteve
Copy link
Member

lesteve commented Apr 15, 2025 •
edited
Loading

I merged main to get rid of the CI GHA linting error.

@DimitriPapadopoulos
MNT git ignore recent black/ruff updates
c256a3d 
* Enforce ruff rules (RUF) (scikit-learn#30694)
* Apply ruff/flake8-implicit-str-concat rules (ISC) (scikit-learn#30695)
* black → ruff format (scikit-learn#31015)
@DimitriPapadopoulos
Copy link
Contributor Author

DimitriPapadopoulos commented Apr 15, 2025 •
edited
Loading

The failure in docs tests seems unrelated. Rebasing may fix a transient failure.

@lesteve
Copy link
Member

lesteve commented Apr 16, 2025

Let's merge this one, thanks!

@lesteve lesteve enabled auto-merge (squash) April 16, 2025 10:24
@lesteve lesteve merged commit 13e7ffb into scikit-learn:main Apr 16, 2025
26 checks passed
@DimitriPapadopoulos DimitriPapadopoulos deleted the git-blame-ignore branch April 16, 2025 14:23
lucyleeow pushed a commit to EmilyXinyi/scikit-learn that referenced this pull request Apr 23, 2025
@DimitriPapadopoulos @lucyleeow
MNT git ignore recent black/ruff updates (scikit-learn#31026)
93ca2f2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ogrisel ogrisel ogrisel approved these changes

Assignees
No one assigned
Labels
No Changelog Needed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DimitriPapadopoulos @lesteve @ogrisel