Merge branch '1.0.x' into 1.1.x

docs/Makefile

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

docs/conf.py

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

docs/make.bat

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

docs/requirements.txt

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