Merge pull request #352 from poldracklab/rel/0.10.1

REL: 0.10.1
poldracklab · Mar 29, 2022 · ebeecde · ebeecde
2 parents a718ecd + cfce9ec
commit ebeecde
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -3,6 +3,11 @@
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 version: 2
 
+build:
+  os: "ubuntu-20.04"
+  tools:
+    python: "3.9"
+
 sphinx:
   configuration: docs/conf.py
 

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,18 @@
+0.10.1 (March 29, 2022)
+=======================
+Bug-fix release in the 0.10.x series.
+
+Most of the fixes come in the upstream fixes of PyBIDS, which will get bundled in
+the Docker image.
+
+* ENH: Set prog name to fitlins, regardless of which CLI program was called (https://github.com/poldracklab/fitlins/pull/350)
+* MNT: Update `bug_report.md` (https://github.com/poldracklab/fitlins/pull/337)
+* CI: Comprehensive testing (https://github.com/poldracklab/fitlins/pull/344)
+* CI: Unify Docker deployment steps (https://github.com/poldracklab/fitlins/pull/334)
+* Build(deps): Bump actions/cache from 2 to 3 (https://github.com/poldracklab/fitlins/pull/347)
+* Build(deps): Bump actions/checkout from 2 to 3 (https://github.com/poldracklab/fitlins/pull/343)
+* Build(deps): Bump actions/setup-python from 2 to 3 (https://github.com/poldracklab/fitlins/pull/340)
+
 0.10.0 (February 01, 2022)
 ==========================
 New feature release in the 0.10.x series.

diff --git a/docs/conf.py b/docs/conf.py
@@ -38,8 +38,8 @@
     'sphinxarg.ext',  # argparse extension
     'sphinxcontrib.apidoc',
     'texext.math_dollar',
-    'm2r',
-    'sphinx_nbexamples',
+    'nbsphinx',
+    'myst_parser',
 ]
 
 # Add any paths that contain templates here, relative to this directory.

diff --git a/setup.cfg b/setup.cfg
@@ -27,7 +27,7 @@ install_requires =
     nilearn~=0.8.1
     pandas>=0.19
     tables>=3.2.1
-    pybids~=0.14.0
+    pybids~=0.15.0
     jinja2
 
 [options.extras_require]
@@ -39,12 +39,12 @@ test =
 workflow =
     %(test)s
 docs =
-    sphinx~=2.4
+    sphinx~=4.5.0
     sphinxcontrib-apidoc~=0.3.0
-    sphinx-argparse~=0.2.5
-    sphinx-nbexamples >=0.4.0
-    texext
-    m2r
+    sphinx-argparse~=0.3.1
+    nbsphinx~=0.8.8
+    texext~=0.6.6
+    myst-parser~=0.17.0
 style =
     flake8 >= 3.7.0
 all =