From 312ea8c5dfa8b0338c1a6fe81c977b2f13e6ce1e Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Tue, 29 Nov 2022 12:26:38 -0500
Subject: [PATCH 1/4] MNT: Update dependencies and classifiers

---
 setup.cfg | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 44f3a7ed60..fe39252631 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,9 +11,10 @@ classifiers =
     Intended Audience :: Science/Research
     Topic :: Scientific/Engineering :: Image Recognition
     License :: OSI Approved :: BSD License
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [options]
 python_requires = >=3.7
@@ -23,7 +24,7 @@ install_requires =
     matplotlib >= 2.2.0
     nibabel >= 4.0.1
     nipype >= 1.7.0
-    niworkflows @ git+https://github.com/nipreps/niworkflows.git@master
+    niworkflows ~= 1.7.0
     numpy
     packaging
     pybids >= 0.11.1

From 0ca2f13b1d8a96683d59d4f615164f73fffb43aa Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Tue, 29 Nov 2022 12:29:04 -0500
Subject: [PATCH 2/4] DOC: 0.10.0 changelog

---
 CHANGES.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 29f7387304..65e135c06d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,20 @@
+0.10.0 (November 30, 2022)
+==========================
+New feature release in the 0.10.x series.
+
+This series supports fMRIPrep 22.1.x and Nibabies 22.2.x.
+
+This will be the last series to support Python 3.7.
+
+* FIX: Expand surfaces pattern to allow morphometrics (#312)
+* ENH: Bind FreeSurfer subjects directory (#311)
+* ENH: Output thickness, curvature, and sulcal depth files (#305)
+* WRAPPER: Update patch location, use --patch syntax (#309)
+* CI: Fix expected ds054 outputs (#310)
+* CI: Set max Python version to 3.10 (#308)
+* CI: Simplify actions to build once, test many (#304)
+* CI: Update CircleCI docker orb (#302)
+
 0.9.2 (July 20, 2022)
 =====================
 Bug-fix release in the 0.9.x series.

From 5873d606d033bdc0c5ae1992a7732d6c750612f4 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Tue, 29 Nov 2022 12:32:18 -0500
Subject: [PATCH 3/4] MNT: Add @ericfeczko to contributors

---
 .zenodo.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.zenodo.json b/.zenodo.json
index 391b6dad6d..eec1b4536c 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -46,6 +46,12 @@
       "name": "Ghosh, Satrajit",
       "orcid": "0000-0002-5312-6729",
       "type": "Researcher"
+    },
+    {
+      "affiliation": "Department of Pediatrics, University of Minnesota, MN, USA",
+      "name": "Feczko, Eric",
+      "orcid": "0000-0003-1337-5517",
+      "type": "Researcher"
     }
   ],
   "keywords": [

From a7e49339c6b1ade9448a720fe7b621dc245843e2 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Tue, 29 Nov 2022 16:40:30 -0500
Subject: [PATCH 4/4] WRAPPER: Expect overlap with --fs-subjects-dir

---
 wrapper/smriprep_docker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wrapper/smriprep_docker.py b/wrapper/smriprep_docker.py
index 3c2f5e03cc..f69b0d7372 100755
--- a/wrapper/smriprep_docker.py
+++ b/wrapper/smriprep_docker.py
@@ -170,7 +170,7 @@ def _get_posargs(usage):
 
     # Make sure we're not clobbering options we don't mean to
     overlap = set(w_flags).intersection(t_flags)
-    expected_overlap = set(["h", "version", "w", "fs-license-file", "use-plugin"])
+    expected_overlap = set(["h", "version", "w", "fs-license-file", "use-plugin", "fs-subjects-dir"])
 
     assert overlap == expected_overlap, "Clobbering options: {}".format(
         ", ".join(overlap - expected_overlap)