From 8aee1a1c20dd2aeec1fe22a87d47128a78938b29 Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Wed, 15 Jan 2020 21:17:13 -0800 Subject: [PATCH] Fixes to use latest sphinx (#1139) * Fixes to use latest sphinx * Update requirements to make allensdk install work * Remove gallery35 tests -- allensdk incompatible with py35 --- .circleci/config.yml | 11 ----------- docs/Makefile | 12 ++++++------ docs/gallery/domain/brain_observatory.py | 2 ++ docs/make.bat | 19 ++++++++++++++++++- docs/source/conf.py | 23 +++++------------------ docs/source/logo.pdf | Bin 0 -> 8923 bytes requirements-doc.txt | 7 +++---- tox.ini | 7 ------- 8 files changed, 34 insertions(+), 47 deletions(-) create mode 100644 docs/source/logo.pdf diff --git a/.circleci/config.yml b/.circleci/config.yml index d4ad8c6a0..2a4ede411 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -193,13 +193,6 @@ jobs: - TEST_WHEELINSTALL_ENV: "wheelinstall-py37" <<: *conda-steps - gallery35: - docker: - - image: circleci/python:3.5.7-jessie - environment: - - TEST_TOX_ENV: "gallery-py35" - <<: *gallery-steps - gallery36: docker: - image: circleci/python:3.6.3-jessie @@ -279,8 +272,6 @@ workflows: <<: *no_filters - miniconda37: <<: *no_filters - - gallery35: - <<: *no_filters - gallery36: <<: *no_filters - gallery37: @@ -294,7 +285,6 @@ workflows: - miniconda35 - miniconda36 - miniconda37 - - gallery35 - gallery36 - gallery37 filters: @@ -314,7 +304,6 @@ workflows: - miniconda35 - miniconda36 - miniconda37 - - gallery35 - gallery36 - gallery37 filters: diff --git a/docs/Makefile b/docs/Makefile index b22e1ffe5..ece536eae 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -9,12 +9,12 @@ PAPER = BUILDDIR = _build SRCDIR = ../src RSTDIR = source -PKGNAME = {pynwb,form} +PKGNAME = pynwb # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(RSTDIR) # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . @@ -41,10 +41,11 @@ help: @echo " changes to make an overview of all changed/added/deprecated items" @echo " linkcheck to check all external links for integrity" @echo " doctest to run all doctests embedded in the documentation (if enabled)" - @echo " apidoc to to build RST from source code" + @echo " clean to clean all documents built by Sphinx in _build" + @echo " apidoc to build RST from source code" clean: - -rm -rf $(BUILDDIR)/* $(RSTDIR)/$(PKGNAME)*.rst $(RSTDIR)/modules.rst + -rm -rf $(BUILDDIR)/* $(RSTDIR)/$(PKGNAME)*.rst html: $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html @@ -158,6 +159,5 @@ doctest: "results in $(BUILDDIR)/doctest/output.txt." apidoc: - $(SPHINXAPIDOC) -f -e -o $(RSTDIR) $(SRCDIR) + $(SPHINXAPIDOC) -f -e --no-toc -o $(RSTDIR) $(SRCDIR) @echo "Build rst docs from source code." - diff --git a/docs/gallery/domain/brain_observatory.py b/docs/gallery/domain/brain_observatory.py index c8d9ac014..469683503 100644 --- a/docs/gallery/domain/brain_observatory.py +++ b/docs/gallery/domain/brain_observatory.py @@ -9,6 +9,8 @@ # This example demostrates the basic functionality of several parts of the pynwb write API, centered around the optical # physiology submodule (pynwb.ophys). We will use the allensdk as a read API, while leveraging the pynwb data model and # write api to transform and write the data back to disk. +# +# .. note: Using the latest allensdk package requires Python 3.6 or higher. ######################################## # .. raw:: html diff --git a/docs/make.bat b/docs/make.bat index deed45a8d..b50d10f3a 100644 --- a/docs/make.bat +++ b/docs/make.bat @@ -5,8 +5,14 @@ REM Command file for Sphinx documentation if "%SPHINXBUILD%" == "" ( set SPHINXBUILD=sphinx-build ) +if "%SPHINXAPIDOC%" == "" ( + set SPHINXAPIDOC=sphinx-apidoc +) set BUILDDIR=_build -set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . +set RSTDIR=source +set SRCDIR=../src +set PKGNAME=pynwb +set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% %RSTDIR% set I18NSPHINXOPTS=%SPHINXOPTS% . if NOT "%PAPER%" == "" ( set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% @@ -35,12 +41,15 @@ if "%1" == "help" ( echo. changes to make an overview over all changed/added/deprecated items echo. linkcheck to check all external links for integrity echo. doctest to run all doctests embedded in the documentation if enabled + echo. clean to clean all documents built by Sphinx in _build + echo. apidoc to build RST from source code" goto end ) if "%1" == "clean" ( for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i del /q /s %BUILDDIR%\* + del /q %RSTDIR%\%PKGNAME%*.rst goto end ) @@ -187,4 +196,12 @@ results in %BUILDDIR%/doctest/output.txt. goto end ) +if "%1" == "apidoc" ( + %SPHINXAPIDOC% -f -e --no-toc -o %RSTDIR% %SRCDIR% + if errorlevel 1 exit /b 1 + echo. + echo.Build rst docs from source code. + goto end +) + :end diff --git a/docs/source/conf.py b/docs/source/conf.py index 162d19544..6cbe0e752 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -14,7 +14,6 @@ import sys import os import sphinx_rtd_theme -from sphinx.domains.python import PythonDomain # -- Support building doc without install -------------------------------------- @@ -71,9 +70,8 @@ } intersphinx_mapping = { - 'python': ('https://docs.python.org/3.5', None), + 'python': ('https://docs.python.org/3.8', None), 'numpy': ('https://docs.scipy.org/doc/numpy/', None), - 'scipy': ('https://docs.scipy.org/doc/scipy/reference', None), 'matplotlib': ('https://matplotlib.org', None), 'h5py': ('http://docs.h5py.org/en/latest/', None), 'hdmf': ('https://hdmf.readthedocs.io/en/latest/', None), @@ -173,7 +171,7 @@ # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -html_favicon = 'favicon-96.png' +html_favicon = 'favicon_96.png' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, @@ -247,7 +245,7 @@ # The name of an image file (relative to this directory) to place at the top of # the title page. -# latex_logo = None +latex_logo = 'logo.pdf' # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. @@ -307,27 +305,17 @@ # def run_apidoc(_): - from sphinx.apidoc import main + from sphinx.ext.apidoc import main as apidoc_main import os import sys out_dir = os.path.dirname(__file__) src_dir = os.path.join(out_dir, '../../src') sys.path.append(src_dir) - main(['-f', '-e', '-o', out_dir, src_dir]) - - -# https://github.com/sphinx-doc/sphinx/issues/3866 -class PatchedPythonDomain(PythonDomain): - def resolve_xref(self, env, fromdocname, builder, typ, target, node, contnode): - if 'refspecific' in node: - del node['refspecific'] - return super(PatchedPythonDomain, self).resolve_xref( - env, fromdocname, builder, typ, target, node, contnode) + apidoc_main(['-f', '-e', '--no-toc', '-o', out_dir, src_dir]) from abc import abstractproperty - def skip(app, what, name, obj, skip, options): if isinstance(obj, abstractproperty) or getattr(obj, '__isabstractmethod__', False): return False @@ -339,5 +327,4 @@ def skip(app, what, name, obj, skip, options): def setup(app): app.connect('builder-inited', run_apidoc) app.add_stylesheet("theme_overrides.css") # overrides for wide tables in RTD theme - app.override_domain(PatchedPythonDomain) app.connect("autodoc-skip-member", skip) diff --git a/docs/source/logo.pdf b/docs/source/logo.pdf new file mode 100644 index 0000000000000000000000000000000000000000..6899de20f66c2fac52e69efeea536fb04c8d9d21 GIT binary patch literal 8923 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 Jlv9_-`5#*I!g&Ay literal 0 HcmV?d00001 diff --git a/requirements-doc.txt b/requirements-doc.txt index aa1bfeed7..8dee1a3be 100644 --- a/requirements-doc.txt +++ b/requirements-doc.txt @@ -1,8 +1,7 @@ -sphinx==1.8.5 +sphinx matplotlib -pillow sphinx_rtd_theme sphinx-gallery -allensdk==0.16.3 -tables==3.5.2 +Glymur==0.8.19 # required for allensdk 1.3.0 to work +allensdk==1.3.0 -r requirements.txt diff --git a/tox.ini b/tox.ini index da02067f9..b4eca5230 100644 --- a/tox.ini +++ b/tox.ini @@ -80,18 +80,11 @@ deps = commands = python test.py --example -[testenv:gallery-py35] -basepython = python3.5 -deps = {[testenv:gallery]deps} -commands = {[testenv:gallery]commands} - - [testenv:gallery-py36] basepython = python3.6 deps = {[testenv:gallery]deps} commands = {[testenv:gallery]commands} - [testenv:gallery-py37] basepython = python3.7 deps = {[testenv:gallery]deps}