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

[DOC] update changelog and git blame ignore #3755

Merged
merged 13 commits into from Jun 19, 2023

Conversation

Remi-Gau
Copy link
Collaborator

@Remi-Gau Remi-Gau commented Jun 14, 2023

Closes #3752
Relates to #3653

Changes proposed in this pull request:

  • update git blame ignore
  • update changelog with changes for pep8 and isort compliance

@github-actions
Copy link
Contributor

github-actions bot commented Jun 14, 2023

👋 @Remi-Gau Thanks for creating a PR!

Until this PR is ready for review, you can include the [WIP] tag in its title, or leave it as a github draft.

Please make sure it is compliant with our contributing guidelines. In particular, be sure it checks the boxes listed below.

  • PR has an interpretable title.
  • PR links to Github issue with mention Closes #XXXX (see our documentation on PR structure)
  • Code is PEP8-compliant (see our documentation on coding style)
  • Changelog or what's new entry in doc/changes/latest.rst (see our documentation on PR structure)

For new features:

  • There is at least one unit test per new function / class (see our documentation on testing)
  • The new feature is demoed in at least one relevant example.

For bug fixes:

  • There is at least one test that would fail under the original bug conditions.

We will review it as quick as possible, feel free to ping us with questions if needed.

@codecov
Copy link

codecov bot commented Jun 14, 2023

Codecov Report

Merging #3755 (f3c7add) into main (f16dcb4) will increase coverage by 0.06%.
The diff coverage is 100.00%.

❗ Current head f3c7add differs from pull request most recent head 568125a. Consider uploading reports for the commit 568125a to get more accurate results

@@            Coverage Diff             @@
##             main    #3755      +/-   ##
==========================================
+ Coverage   91.54%   91.60%   +0.06%     
==========================================
  Files         139      139              
  Lines       16591    16591              
  Branches     3244     3244              
==========================================
+ Hits        15188    15198      +10     
+ Misses       1402     1390      -12     
- Partials        1        3       +2     
Impacted Files Coverage Δ
nilearn/plotting/matrix_plotting.py 96.59% <100.00%> (ø)

... and 5 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Remi-Gau Remi-Gau marked this pull request as ready for review June 15, 2023 08:05
@Remi-Gau
Copy link
Collaborator Author

Related to #3701 (comment)

 git blame --ignore-revs-file .git-blame-ignore-revs nilearn/image/resampling.py 

Still shows content from 3651 event though it is supposed to be ignored:

# run isort and flake8 on the whole nilearn code base in CI (#3651)
44933309ecd09add795ce1c3ea5edaab4294da87

More annoyingly it is also still the case for:

 git blame --ignore-rev 44933309  nilearn/image/resampling.py

@Remi-Gau
Copy link
Collaborator Author

Behavior is the same on the github interface that supposedly picks up on git blame ignore:

https://github.com/Remi-Gau/nilearn/blame/ignore_blame/nilearn/image/resampling.py

@Remi-Gau
Copy link
Collaborator Author

things I have tried:

  • only having the commit shasum in the file with no comment (help identify invalid commit number but does not fix the issue)

@Remi-Gau Remi-Gau requested a review from ymzayek June 19, 2023 13:37
@Remi-Gau
Copy link
Collaborator Author

I still cannot make the git blame ignore work properly to ignore the PRs listed in it but at least the PRs for flake8 and isort compliance are listed

Copy link
Member

@ymzayek ymzayek left a comment

Choose a reason for hiding this comment

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

@Remi-Gau it LGTM! I think then we can leave #3653 open with a comment that we still need to get it to work. But I'm ok for merging this PR

@Remi-Gau
Copy link
Collaborator Author

yup that was my idea.

Merging this then.

@Remi-Gau Remi-Gau merged commit ee09dce into nilearn:main Jun 19, 2023
17 of 26 checks passed
@Remi-Gau Remi-Gau deleted the ignore_blame branch June 19, 2023 13:47
Remi-Gau added a commit to Remi-Gau/nilearn that referenced this pull request Jun 19, 2023
* update git-blame-ignore

* update changelog

* fix

* update ignore

* fix regex escape

* flake8

* use list and not set

* simplify rev file

* rm spaces

* pragmatism wins

* rm import

* reset plotting files
Remi-Gau added a commit that referenced this pull request Jun 20, 2023
* add workflow for flynt

* configure and run flynt

* flake8

* Update .github/workflows/f_strings.yml

Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>

* Update nilearn/_utils/data_gen.py

Co-authored-by: bthirion <bertrand.thirion@inria.fr>

* pre-commit hooks auto-update (#3764)

Co-authored-by: Remi-Gau <Remi-Gau@users.noreply.github.com>

* [DOC] update changelog and git blame ignore (#3755)

* update git-blame-ignore

* update changelog

* fix

* update ignore

* fix regex escape

* flake8

* use list and not set

* simplify rev file

* rm spaces

* pragmatism wins

* rm import

* reset plotting files

* [FIX] Change error string to match scikit-learn `InvalidParameterError` message (#3763)

* Modify ValueError string

* Warning based on sklearn version

* relax regex for warning on sanitize reorder error (#3766)

---------

Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
Co-authored-by: bthirion <bertrand.thirion@inria.fr>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Remi-Gau <Remi-Gau@users.noreply.github.com>
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.

Update changelog for PRs related to PEP8 compliance
2 participants