Skip to content

Commit c4a4cee

Browse files
authored
🐛 Fix minified pipelines (#1801)
2 parents 776e7e6 + d430c09 commit c4a4cee

35 files changed

+5092
-3166
lines changed

.github/workflows/check_updated_version.yml renamed to .github/workflows/check_updated_preconfigs.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
name: Check updated version
1+
name: Check updated preconfigs
22

33
on:
44
pull_request_target:
55
types: [edited, opened, reopened, ready_for_review, synchronize]
66
push:
77

88
jobs:
9-
check-updated-version:
10-
name: Check if version updated
9+
check-updated-preconfigs:
10+
name: Check if preconfigs need updated
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out C-PAC
1414
uses: actions/checkout@v2
1515
with:
1616
fetch-depth: 2
17+
- uses: actions/setup-python@v4
18+
with:
19+
python-version: '3.9'
20+
cache: 'pip'
1721
- name: Check if version updated
1822
run: |
1923
git config --global user.email "[email protected]"
@@ -37,6 +41,14 @@ jobs:
3741
[skip ci]"
3842
git push origin HEAD:${GITHUB_BRANCH} || true
3943
fi
44+
export PYTHONPATH=$PWD
45+
pip install nipype numpy matplotlib pandas pathvalidate pytz pyyaml voluptuous yamlordereddictloader
46+
python ./CPAC/utils/configuration/yaml_template.py
47+
if [[ ! -z $(git diff origin/${GITHUB_BRANCH}) ]]
48+
then
49+
git add CPAC/resources/configs
50+
git commit -m ":bulb: Update comments based on default preconfig"
51+
fi
4052
COMMIT_MESSAGE=$(git log -1 --pretty=%B)
4153
if [[ ! "$COMMIT_MESSAGE" == *"Update version to"* ]]
4254
then
@@ -48,14 +60,14 @@ jobs:
4860
git add version CPAC/resources/configs
4961
if [[ ! -z $(git diff origin/${GITHUB_BRANCH}) ]]
5062
then
51-
git commit -m ":bookmark: Update version to ${VERSION} ($COMMIT_MESSAGE)"
63+
git commit -m ":bookmark: Update version to ${VERSION} ($COMMIT_MESSAGE)" || true
5264
git push origin HEAD:${GITHUB_BRANCH} || true
5365
fi
5466
cd ..
5567
fi
5668
5769
trigger-next-workflow:
58-
needs: check-updated-version
70+
needs: check-updated-preconfigs
5971
runs-on: ubuntu-latest
6072
steps:
6173
- name: Set up check

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3434
- Added crash messages from during and before graph building to logs
3535
- Added data-config-specific hash string to C-PAC-generated config files
3636
- Updated `rbc-options` preconfig to use `fmriprep-options` preprocessing
37+
- Changed minimized pipeline base from `default` to `blank`
3738

3839
### Fixed
40+
- Fixed [a bug](https://github.com/FCP-INDI/C-PAC/issues/1779) in which generated pipeline configs were not 100% accurate. The only affected configurable option discovered in testing was seed-based correlation analysis always reverting to the default configuration.
3941
- Fixed [bug](https://github.com/FCP-INDI/C-PAC/issues/1795) that was causing `cpac run` to fail when passing a manual random seed via `--random_seed`.
4042
- Replaces ``DwellTime`` with ``EffectiveEchoSpacing`` for FSL usage of the term
4143
- Fixed an issue that was causing some epi field maps to not be ingressed if the BIDS tags were not in the correct order.

CPAC/pipeline/cpac_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from CPAC.utils.monitoring import failed_to_start, log_nodes_cb
2727
from CPAC.longitudinal_pipeline.longitudinal_workflow import \
2828
anat_longitudinal_wf
29-
from CPAC.utils.yaml_template import upgrade_pipeline_to_1_8
29+
from CPAC.utils.configuration.yaml_template import upgrade_pipeline_to_1_8
3030

3131

3232
# Run condor jobs

0 commit comments

Comments
 (0)