From 060a7ff213920fe3bf43db752068d73bd48f9233 Mon Sep 17 00:00:00 2001 From: delavega4 Date: Wed, 27 Jan 2021 15:35:48 -0600 Subject: [PATCH 1/7] Update CHANGELOG --- CHANGES.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 59a15990..5c321789 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,20 @@ +0.8.1 (January 27, 2021) +======================== + +New feature release in the 0.8.x series. + +This release added AFNI's 3dREMLfit for first-level estimation, dropped nistats +in favor of nilearn.stats, and several other minor improvements. + +* ENH: disable automatic drift modeling (https://github.com/poldracklab/fitlins/pull/276) +* ENH: modify path patterns to make task optional (https://github.com/poldracklab/fitlins/pull/275) +* MNT: Update PyBIDS and nilearn (https://github.com/poldracklab/fitlins/pull/268) +* FIX: AFNI contrast bool (https://github.com/poldracklab/fitlins/pull/266) +* CI: Make faster? (https://github.com/poldracklab/fitlins/pull/264) +* TST: Add dummy dataset for pytest/local testing (https://github.com/poldracklab/fitlins/pull/262) +* ENH: Add AFNI 3dREMLfit for first-level estimation (https://github.com/poldracklab/fitlins/pull/171) + + 0.8.0 (October 19, 2020) ======================== From f7b743c0708cb460c8904638006d7036e5faa36f Mon Sep 17 00:00:00 2001 From: delavega4 Date: Wed, 27 Jan 2021 15:35:56 -0600 Subject: [PATCH 2/7] Update zenodo --- .zenodo.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.zenodo.json b/.zenodo.json index adbfd933..a2377684 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -49,6 +49,25 @@ "name": "Gorgolewski, Krzysztof J.", "affiliation": "Department of Psychology, Stanford University", "orcid": "0000-0003-3321-7583" + }, + { + "name": "Gorgolewski, Krzysztof J.", + "affiliation": "Department of Psychology, Stanford University", + "orcid": "0000-0003-3321-7583" + }, + { + "name": "Gorgolewski, Krzysztof J.", + "affiliation": "Department of Psychology, Stanford University", + "orcid": "0000-0003-3321-7583" + }, + { + "affiliation": "University of Texas at Austin", + "name": "Kent, James D.", + "orcid": "0000-0002-4892-2659" + }, + { + "affiliation": "National Institute of Mental Health", + "name": "Lee, John" } ], "keywords": [ From 52b2fe814c179ad6a2ce1d62444b89cb7cc7d6d0 Mon Sep 17 00:00:00 2001 From: delavega4 Date: Wed, 27 Jan 2021 15:58:26 -0600 Subject: [PATCH 3/7] Review suggestions, and add one more PR --- .zenodo.json | 24 +++++++----------------- CHANGES.md | 11 ++++++----- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index a2377684..05e2dd30 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -41,33 +41,23 @@ "orcid": "0000-0003-4613-6643" }, { - "name": "Poldrack, Russell A.", - "affiliation": "Department of Psychology, Stanford University", - "orcid": "0000-0001-6755-0259" + "affiliation": "University of Texas at Austin", + "name": "Kent, James D.", + "orcid": "0000-0002-4892-2659" }, { - "name": "Gorgolewski, Krzysztof J.", - "affiliation": "Department of Psychology, Stanford University", - "orcid": "0000-0003-3321-7583" + "affiliation": "National Institute of Mental Health", + "name": "Lee, John" }, { - "name": "Gorgolewski, Krzysztof J.", + "name": "Poldrack, Russell A.", "affiliation": "Department of Psychology, Stanford University", - "orcid": "0000-0003-3321-7583" + "orcid": "0000-0001-6755-0259" }, { "name": "Gorgolewski, Krzysztof J.", "affiliation": "Department of Psychology, Stanford University", "orcid": "0000-0003-3321-7583" - }, - { - "affiliation": "University of Texas at Austin", - "name": "Kent, James D.", - "orcid": "0000-0002-4892-2659" - }, - { - "affiliation": "National Institute of Mental Health", - "name": "Lee, John" } ], "keywords": [ diff --git a/CHANGES.md b/CHANGES.md index 5c321789..9f6de3cf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,18 +1,19 @@ -0.8.1 (January 27, 2021) +0.9.0 (January 27, 2021) ======================== -New feature release in the 0.8.x series. +New feature release in the 0.9.x series. This release added AFNI's 3dREMLfit for first-level estimation, dropped nistats in favor of nilearn.stats, and several other minor improvements. +* FIX: AFNI contrast bool (https://github.com/poldracklab/fitlins/pull/266) +* ENH: Writeout estimator to derivative description (https://github.com/poldracklab/fitlins/pull/278) * ENH: disable automatic drift modeling (https://github.com/poldracklab/fitlins/pull/276) * ENH: modify path patterns to make task optional (https://github.com/poldracklab/fitlins/pull/275) +* ENH: Add AFNI 3dREMLfit for first-level estimation (https://github.com/poldracklab/fitlins/pull/171) +* TST: Add dummy dataset for pytest/local testing (https://github.com/poldracklab/fitlins/pull/262) * MNT: Update PyBIDS and nilearn (https://github.com/poldracklab/fitlins/pull/268) -* FIX: AFNI contrast bool (https://github.com/poldracklab/fitlins/pull/266) * CI: Make faster? (https://github.com/poldracklab/fitlins/pull/264) -* TST: Add dummy dataset for pytest/local testing (https://github.com/poldracklab/fitlins/pull/262) -* ENH: Add AFNI 3dREMLfit for first-level estimation (https://github.com/poldracklab/fitlins/pull/171) 0.8.0 (October 19, 2020) From 179a9ddce0b84ea0e552da83817e561cf8b60ddb Mon Sep 17 00:00:00 2001 From: john lee Date: Thu, 28 Jan 2021 12:52:16 -0500 Subject: [PATCH 4/7] Update .zenodo.json (#279) --- .zenodo.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.zenodo.json b/.zenodo.json index 05e2dd30..e52b45f4 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -47,7 +47,8 @@ }, { "affiliation": "National Institute of Mental Health", - "name": "Lee, John" + "name": "Lee, John A.", + "orcid": "0000-0001-5884-4247" }, { "name": "Poldrack, Russell A.", From 780a48a0e36a7e7af6ed5a084de6be4bd4512811 Mon Sep 17 00:00:00 2001 From: Alejandro de la Vega Date: Fri, 26 Feb 2021 15:38:42 -0600 Subject: [PATCH 5/7] Add new PR to CHANGES --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 9f6de3cf..a66b251c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,8 +4,9 @@ New feature release in the 0.9.x series. This release added AFNI's 3dREMLfit for first-level estimation, dropped nistats -in favor of nilearn.stats, and several other minor improvements. +in favor of nilearn.stats, added test reference outputs, among other minor improvements. +* AFNI TSNR calculation, ADD: BlurToFWHM, ADD: testing outputs against reference (https://github.com/poldracklab/fitlins/pull/280) * FIX: AFNI contrast bool (https://github.com/poldracklab/fitlins/pull/266) * ENH: Writeout estimator to derivative description (https://github.com/poldracklab/fitlins/pull/278) * ENH: disable automatic drift modeling (https://github.com/poldracklab/fitlins/pull/276) From 0542e6144a992f1cf55e0731e17eb105cc442524 Mon Sep 17 00:00:00 2001 From: Alejandro de la Vega Date: Fri, 26 Feb 2021 16:46:26 -0600 Subject: [PATCH 6/7] Update CHANGELOG date --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index a66b251c..bdd771ce 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -0.9.0 (January 27, 2021) +0.9.0 (February 26, 2021) ======================== New feature release in the 0.9.x series. From 0cfb456ae38a6cbffbbeadfabc2c5d7f79e0809f Mon Sep 17 00:00:00 2001 From: shotgunosine Date: Thu, 4 Mar 2021 13:02:59 -0500 Subject: [PATCH 7/7] FIX test specification of drift model --- fitlins/tests/test_outputs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fitlins/tests/test_outputs.py b/fitlins/tests/test_outputs.py index 232b209f..1b116eee 100644 --- a/fitlins/tests/test_outputs.py +++ b/fitlins/tests/test_outputs.py @@ -98,7 +98,8 @@ def test_outputs(fitlins_path, bids_dir, output_dir, derivatives, "--estimator", estimator, "--smoothing", smoothing, "--n-cpus", '2', - "--mem-gb", '4' + "--mem-gb", '4', + "--drift-model", "cosine" ] if database_path is not None: