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

Quality (actions, pre-commit) and tests #31

Merged
merged 37 commits into from
Dec 5, 2022
Merged

Quality (actions, pre-commit) and tests #31

merged 37 commits into from
Dec 5, 2022

Conversation

kaitj
Copy link
Collaborator

@kaitj kaitj commented Nov 22, 2022

Proposed changes

This PR consolidates the changes first introduced in #18, adding quality actions and tasks. Additionally, adds dry-run testing for different flag options, namely to ensure the additional directory flags do not cause any issues for the workflow.

Note that this PR only ensure the dry-runs can pass without issues.

Types of changes

What types of changes does your code introduce? Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionalitiy)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Other (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you are unsure about any of the choices, don't hesitate to ask!

  • Changes have been tested to ensure that fix is effective or that a feature works.
  • Changes pass the unit tests
  • Code has been run through the poe quality task
  • I have included necessary documentation or comments (as necessary)
  • Any dependent changes have been merged and published

Notes

All PRs will undergo the unit testing before being reviewed. You may be requested to explain or make additional changes before the PR is accepted.

kaitj and others added 14 commits November 16, 2022 10:44
Will assign a reviewer when new PRs are made or when marked ready for review. Any reviews required after initial will need to be triggered by user.
- Added opionated yaml linter to pre-commit hook and github action
  - Requires shell command to filter and exclude snakemake and snakebids
files
- Run yamlfix on all other yaml files
- Add gitignore
- Add bids_dir
- Adds necessary derivatives
  - dwi is doubled to perform two different tests (one for dwi_dir flag)
  - freesurfer directories / files
- ensure paths passed through are absolute (exception for testing)
- fix workflow issues
- add poe task for testing --responsemean_dir flag
- fixed responsemean call (expansion over subjects)
- Created check_dir_path function to check if user passed directories
are absolute paths. Throw an error otherwise
- Replace existing checks in freesurfer and mrtpipelines with function.
- Added dwi_flag for preprocessed data
- Added check to make sure absolute path is passed
- Added test data within prepdwi directory for testing purposes
@kaitj kaitj added the maintenance Updates or improvements that do not change functionality of the code label Nov 22, 2022
@kaitj kaitj mentioned this pull request Nov 22, 2022
9 tasks
@kaitj kaitj marked this pull request as ready for review November 22, 2022 23:58
@kaitj kaitj linked an issue Nov 22, 2022 that may be closed by this pull request
4 tasks
- Added tpl and updated names for MNI152NLin6Asym
- Renamed MNI2009b -> MNI152NLin2009bAsym
- Removed unnecessary files
- Update config
- Update config to include tsv for subcortical labels
- Update freesurfer tsv to match bids spec
- Update file name of Freesurfer dseg tsv
- Add inputs to rule all for copying freesurfer and zona tsv files to
appropriate location
- Still need to fix piping of workflow, update entities, and filenames
- Adds in rule for labelmerge (needs updating with container and proper
command)
- Update resources with correct names and paths
- Add tsv to rule all for copying from resource to bids folders for
labelmerge
- Simplify rule all
Copy link
Collaborator

@tkkuehn tkkuehn 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 and the tests run through on my machine

@tkkuehn
Copy link
Collaborator

tkkuehn commented Dec 5, 2022

Will merge once we get #30 merged into dry-run.

Copy link
Collaborator

@tkkuehn tkkuehn left a comment

Choose a reason for hiding this comment

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

After merging labelmerge, the test_dwi task fails (in the actions workflow and locally for me).

@kaitj
Copy link
Collaborator Author

kaitj commented Dec 5, 2022

Should be fixed now in 717fd3a. Was an issue in where it was pulling the subjects from.

Once this is merged in, I will rebase #32 before marking that ready for review once tested.

@tkkuehn tkkuehn merged commit bfecbea into main Dec 5, 2022
@tkkuehn tkkuehn deleted the dry-run branch December 5, 2022 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Updates or improvements that do not change functionality of the code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Run pre-commit / gh actions
2 participants