Merge branch '0.12.x' into 1.0.x

This commit is contained in:
David Lord 2019-09-24 06:43:25 -07:00
commit 563ef469f7
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
4 changed files with 11 additions and 10 deletions

View file

@ -1,9 +1,10 @@
# Minimal makefile for Sphinx documentation # Minimal makefile for Sphinx documentation
# #
# You can set these variables from the command line. # You can set these variables from the command line, and also
SPHINXOPTS = # from the environment for the first two.
SPHINXBUILD = sphinx-build SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = . SOURCEDIR = .
BUILDDIR = _build BUILDDIR = _build

View file

@ -1,5 +1,4 @@
import packaging import packaging.version
from pallets_sphinx_themes import get_version from pallets_sphinx_themes import get_version
from pallets_sphinx_themes import ProjectLink from pallets_sphinx_themes import ProjectLink

View file

@ -25,11 +25,11 @@ if errorlevel 9009 (
exit /b 1 exit /b 1
) )
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
goto end goto end
:help :help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
:end :end
popd popd

View file

@ -1,4 +1,5 @@
Sphinx~=2.1.2 Sphinx~=2.2.0
Pallets-Sphinx-Themes~=1.1.4 Pallets-Sphinx-Themes~=1.2.2
sphinxcontrib-log-cabinet~=1.0.0 sphinxcontrib-log-cabinet~=1.0.1
sphinx-issues~=1.2.0 sphinx-issues~=1.2.0
packaging~=19.2