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

STY: Apply ruff/pyupgrade rule UP031 #3280

Merged
merged 8 commits into from
May 4, 2024

Conversation

DimitriPapadopoulos
Copy link
Contributor

New in ruff v0.4.2.

Copy link

codecov bot commented May 4, 2024

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 73.84%. Comparing base (1e45712) to head (a16071b).

Files Patch % Lines
fmriprep/utils/bids.py 0.00% 2 Missing ⚠️
fmriprep/cli/workflow.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3280   +/-   ##
=======================================
  Coverage   73.84%   73.84%           
=======================================
  Files          56       56           
  Lines        4289     4289           
=======================================
  Hits         3167     3167           
  Misses       1122     1122           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@DimitriPapadopoulos
Copy link
Contributor Author

DimitriPapadopoulos commented May 4, 2024

Fixing the ImportError: cannot import name 'get_cmap' from 'matplotlib.cm' CI error requires nipreps/nireports#98.

.maint/paper_author_list.py Outdated Show resolved Hide resolved
.maint/paper_author_list.py Outdated Show resolved Hide resolved
DimitriPapadopoulos and others added 2 commits May 4, 2024 20:43
Copy link
Member

@effigies effigies left a comment

Choose a reason for hiding this comment

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

ISC001 should detect and fix them: https://docs.astral.sh/ruff/rules/single-line-implicit-string-concatenation/

Some more suggestions that can't be auto-fixed.

.maint/update_authors.py Outdated Show resolved Hide resolved
fmriprep/cli/parser.py Outdated Show resolved Hide resolved
fmriprep/cli/parser.py Outdated Show resolved Hide resolved
fmriprep/cli/workflow.py Outdated Show resolved Hide resolved
DimitriPapadopoulos and others added 3 commits May 4, 2024 21:09
Co-authored-by: Chris Markiewicz <[email protected]>
Co-authored-by: Chris Markiewicz <[email protected]>
Co-authored-by: Chris Markiewicz <[email protected]>
@DimitriPapadopoulos
Copy link
Contributor Author

ISC001 should detect and fix them: https://docs.astral.sh/ruff/rules/single-line-implicit-string-concatenation/

Indeed, but ruff format should refrain from creating them when unfolding strings. I'll to reproduce and create a bug report.

@DimitriPapadopoulos
Copy link
Contributor Author

It's a known ruff issue: astral-sh/ruff#9457

In the meantime, there's no better solution than explicitly running ruff check --select ISC001 after ruff format — while the intended order is check before format.

DimitriPapadopoulos and others added 2 commits May 4, 2024 22:05
	ISC001 Implicitly concatenated string literals on one line

This rule is currently disabled because it conflicts with the formatter:
	astral-sh/ruff#8272
Co-authored-by: Chris Markiewicz <[email protected]>
@effigies effigies merged commit 3cbf147 into nipreps:master May 4, 2024
11 of 12 checks passed
@DimitriPapadopoulos DimitriPapadopoulos deleted the UP031 branch May 4, 2024 21:52
effigies added a commit that referenced this pull request Jun 17, 2024
24.0.0 (June 17, 2024)

New feature release in the 24.0.x series.

This release is an incremental improvement on 23.2.x, with some
fixes for bugs discovered in the updated workflow.

New features include separation of HTML reports by session for subjects
with many BOLD runs, a new ``--fs-no-resume`` option to improve interoperability
with less typical FreeSurfer directories, such as those generated by longitudinal
FreeSurfer or FastSurfer, and adoption of DatasetLinks and BIDS-URIs, to follow
the recommendations of recent versions of BIDS.

With thanks to Dimitri Papadopoulos, Basile Pinsard, Celine Provins, Taylor Salo
and Wang Hao-Ting for their contributions!

* FIX: Add "double" type to allowed DisplacementFieldTransform (#3287)
* FIX: Require recent templateflow, select correct aparc dseg.tsv (#3256)
* FIX: Ensure proper templates are retrieved with sloppy (#3251)
* FIX: Delete summary from functional report when separated by sessions (#3223)
* FIX: Support lists in bids filter file containing ``null`` or ``*`` (#3215)
* FIX: Re-enable anat fasttrack for dataset without t1w (#3202)
* ENH: Use BIDSURI in init_ds_boldmask_wf (#3297)
* ENH: Add templateflow to DatasetLinks (#3267)
* ENH: Track proximal sources of functional GIFTIs (#3263)
* ENH: Support named derivative paths (#3264)
* ENH: Track Sources for standard-space outputs (#3262)
* ENH: Add --fs-no-resume option to reuse existing FreeSurfer outputs without resuming (#3142)
* ENH: Use BIDS URIs to track Sources in sidecars (#3255)
* ENH: Ignore unselected subjects in BIDSLayoutIndexer (#3236)
* ENH: Add metadata for motion parameters (#3245)
* ENH: Separate anatomical and functional reports per session for densely sampled dataset (#3191)
* ENH: Leverage T2w if available for BOLD -> anat coregistration (#3208)
* RF: Fix ITK warp conversion to nitransforms format (#3300)
* RF: Load report assembler from nireports (#3177)
* DOC: Clarify ``--dvars-spike-threshold`` uses standardized DVARS (#3205)
* TST: Update test to reflect new report generation behavior (#3210)
* STY: Manual conversions to f-strings (#3241)
* STY: Apply ruff/pyupgrade rule UP031 (#3280)
* STY: Lint and style check full repository (#3221)
* STY: Adopt ruff for linting and formatting (#3206)
* MNT: Pin libitk 5.3 and note dependencies (#3298)
* MNT: Upgrade ruff pre-commit, add fixing checks (#3283)
* MNT: Complete transition from flake8/black to ruff (#3279)
* MNT: Apply Repo-Review suggestions (#3194)
* MNT: Verbatim copy of Apache license 2.0 (#3259)
* MNT: Bump cryptography from 41.0.7 to 42.0.4 (#3234)
* MNT: Drop copyright year, unused dunder fields (#3247)
* MNT: Update environment pins (#3226)
* MNT: Bump codecov/codecov-action from 3 to 4 (#3219)
* DOCKER: Restore mincinfo binary (#3249)
* CI: Move to new circle machine tags (#3248)
* CI: Avoid ruff warning (#3244)
* CI: Pass ruff tests (#3243)
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