Skip to content

Commit

Permalink
Merge pull request #1764 from FCP-INDI/fix/pipeline-config-versions
Browse files Browse the repository at this point in the history
🔖 Hotfix: Update version to 1.8.4
  • Loading branch information
sgiavasis committed Sep 20, 2022
2 parents 12c4f74 + 94d8082 commit 9586d71
Show file tree
Hide file tree
Showing 47 changed files with 46 additions and 49 deletions.
3 changes: 0 additions & 3 deletions CPAC/pipeline/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -1949,9 +1949,6 @@ def initiate_rpool(wf, cfg, data_paths=None, part_id=None):
ingress_raw_func_data(wf, rpool, cfg, data_paths, unique_id,
part_id, ses_id)

# grab already-processed data from the output directory
rpool = ingress_output_dir(cfg, rpool, unique_id, creds_path)

# grab any file paths from the pipeline config YAML
rpool = ingress_pipeconfig_paths(cfg, rpool, unique_id, creds_path)

Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/data_config_S3-BIDS-ABIDE.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/data_config_S3-BIDS-ADHD200.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/data_config_cpac_benchmark.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/data_settings_template.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Settings File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/group_config_template.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Group-Level Analysis Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_abcd-options.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_anat-only.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_benchmark-ANTS.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_benchmark-FNIRT.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_blank.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_ccs-options.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_fx-options.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_monkey-ABCD.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_monkey.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_ndmg.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_nhp-macaque.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_preproc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_rbc-options.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file for RBC options
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_regtest-1.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_regtest-2.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_regtest-3.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_regtest-4.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/pipeline_config_rodent.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/system_config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# C-PAC System Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CPAC Data Configuration File
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/test_configs/pipe-test_ABCD.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion CPAC/resources/configs/test_configs/pipe-test_all.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Documentation pertaining to this latest release can be found here: https://fcp-i
Discussion Forum
---------------

If you are stuck and need help or have any other questions or comments about C-PAC, there is a C-PAC discussion forum here: ttps://neurostars.org/tag/cpac
If you are stuck and need help or have any other questions or comments about C-PAC, there is a C-PAC discussion forum here: https://neurostars.org/tag/cpac

Issue Tracker and Bugs
----------------------
Expand Down
2 changes: 1 addition & 1 deletion dev/docker_data/default_pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
# CPAC Pipeline Configuration YAML file
# Version 1.8.4.dev
# Version 1.8.4
#
# http://fcp-indi.github.io for more info.
#
Expand Down

0 comments on commit 9586d71

Please sign in to comment.