From a9b9a962129dafa6f74285fd047cb69d4245a8dd Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sat, 18 Apr 2020 11:18:29 -0400 Subject: [PATCH 1/4] DOC: Try with Sphinx 3 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index dbfba502c..5aa7f913c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,7 +54,7 @@ doc = packaging pydot >= 1.2.3 pydotplus - sphinx >= 1.5.3, < 3 + sphinx >= 1.5.3 sphinx-argparse sphinx_rtd_theme sphinxcontrib-napoleon From 9525f0abb2c7a565cc645e8262be9de048742a3b Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sat, 18 Apr 2020 11:25:20 -0400 Subject: [PATCH 2/4] DOC: Update intersphinx mapping --- docs/conf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index fb6fbdb04..170665cb8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -335,10 +335,10 @@ # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { - "python": ("https://docs.python.org/", None), - "numpy": ("http://docs.scipy.org/doc/numpy", None), - "scipy": ("http://docs.scipy.org/doc/scipy/reference", None), - "matplotlib": ("http://matplotlib.sourceforge.net", None), + "python": ("https://docs.python.org/3/", None), + "numpy": ("https://docs.scipy.org/doc/numpy", None), + "scipy": ("https://docs.scipy.org/doc/scipy/reference", None), + "matplotlib": ("https://matplotlib.org/", None), "bids": ("https://bids-standard.github.io/pybids/", None), "nibabel": ("https://nipy.org/nibabel/", None), "nipype": ("https://nipype.readthedocs.io/en/latest/", None), From 8e49616bca615aad08b8faee51cb05aa97fed9c3 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sat, 18 Apr 2020 11:27:15 -0400 Subject: [PATCH 3/4] DOC: Use add_css/js_file methods --- docs/conf.py | 4 ++-- setup.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 170665cb8..b0d271f62 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -352,6 +352,6 @@ def setup(app): - app.add_stylesheet("theme_overrides.css") + app.add_css_file("theme_overrides.css") # We need this for the boilerplate script - app.add_javascript("https://cdn.rawgit.com/chrisfilo/zenodo.js/v0.1/zenodo.js") + app.add_js_file("https://cdn.rawgit.com/chrisfilo/zenodo.js/v0.1/zenodo.js") diff --git a/setup.cfg b/setup.cfg index 5aa7f913c..16d5285c0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,7 +54,7 @@ doc = packaging pydot >= 1.2.3 pydotplus - sphinx >= 1.5.3 + sphinx >= 1.8 sphinx-argparse sphinx_rtd_theme sphinxcontrib-napoleon From 10ebed257b838689fb28e108acbc9e1a122e7000 Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Wed, 3 Jun 2020 12:45:06 -0400 Subject: [PATCH 4/4] PIN: Nipype 1.5 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 16d5285c0..2e82805cf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ python_requires = >=3.7 install_requires = indexed_gzip >= 0.8.8 nibabel >= 3.0 - nipype >= 1.4 + nipype >= 1.5 nitime nitransforms >= 20.0.0rc3,<20.2 niworkflows ~= 1.2.3