search

aramis-lab / clinica

Software platform for clinical neuroimaging studies
http://www.clinica.run/
Other
218 stars 72 forks source link

[ENH] Unify DatasetType class #1162

Closed AliceJoubert closed 2 months ago

AliceJoubert commented 2 months ago

Closes #1151 issue

AliceJoubert commented 2 months ago

@NicolasGensollen

I might have done this the wrong way. I pulled the changes from my upstream remote to my local dev, then rebased the local datasetType branch on dev. Things got complicated after when trying to get that on my origin remote because push origin datasetType failed due to the branches diverging. I think I did pull origin datasetType --rebase before pushing again and that's probably where it went wrong.

NicolasGensollen commented 2 months ago

@AliceJoubert No worries, I fixed it (but I forced pushed to your branch). I can show you tomorrow how to rebase in a clean way.

The PR should have the latest commits of dev, and we should be back with the unit test error that we need to fix:

=========================== short test summary info ============================
FAILED test/unittests/utils/test_utils_inputs.py::test_check_bids_folder_missing_dataset_description_error - AssertionError: Regex pattern did not match.
 Regex: 'The\\ BIDS\\ directory\\ \\(/tmp/pytest\\-of\\-runner/pytest\\-0/test_check_bids_folder_missing0\\)\\ you\\ provided\\ is\\ missing\\ a\\ dataset_description\\.json\\ file\\.'
 Input: 'The raw directory (/tmp/pytest-of-runner/pytest-0/test_check_bids_folder_missing0) you provided is missing a dataset_description.json file.'
================= 1 failed, 857 passed, 43 warnings in 11.73s ==================
AliceJoubert commented 2 months ago

Alright, thanks @NicolasGensollen !!