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

[MISC] consistently use "directory" instead of "folder" as a term #1044

Merged
merged 4 commits into from
Apr 4, 2022

Conversation

sappelhoff
Copy link
Member

closes #1039

Ideally we would add a CI step that checks for the [fF]older[s]{0,1} regex.

@codecov
Copy link

codecov bot commented Mar 29, 2022

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.50%. Comparing base (7ec7450) to head (e3eef7c).
Report is 1435 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1044      +/-   ##
==========================================
+ Coverage   70.53%   71.50%   +0.96%     
==========================================
  Files           9        9              
  Lines         930      930              
==========================================
+ Hits          656      665       +9     
+ Misses        274      265       -9     

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

@yarikoptic
Copy link
Collaborator

+1 on consistency!
This PR reminded me about #962 where I unified "file name" into "filename". Now, looking at all "directory name"s and "subdirectory name", I wonder if that was the right decision ;-) : "directoryname" is not good. "foldername" also ugly, "subfoldername" is really needing German expertise.

Copy link
Collaborator

@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.

Looks good modulo preceding comment.

@sappelhoff sappelhoff merged commit d9eeb6d into bids-standard:master Apr 4, 2022
@sappelhoff sappelhoff deleted the folder/directory branch April 4, 2022 14:50
Lestropie added a commit to Lestropie/bids-specification that referenced this pull request Apr 29, 2022
Resolves bids-standard#947 against:
- bids-standard#962 (21b7725)
- bids-standard#1044 (d9eeb6d)
- bids-standard#867 (5fe26e1)
- bids-standard#998 (e47283a)

Conflicts:
	src/02-common-principles.md
	src/schema/README.md
	src/schema/objects/entities.yaml
	src/schema/objects/metadata.yaml
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.

Folder vs. Directory
4 participants