Add test for latest sphinx branch

And change option for cores used by sphinx (-j auto)
mmilian · Jul 12, 2018 · 01f6251 · 01f6251
1 parent dc44c97
commit 01f6251
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
     - python: 3.5
       env: TOXENV=py
     - python: 3.6
-      env: TOXENV=py,codecov
+      env: TOXENV=py,sphinx-dev,codecov
     - python: 3.7-dev
       env: TOXENV=py
     - python: pypy

diff --git a/Makefile b/Makefile
@@ -74,7 +74,7 @@ flake8:  ## run flake8 syntax check
 
 .PHONY: docs
 docs:  ## build document
-	@sphinx-build -E -W -n -j 4 -b html docs docs/_build/html
+	@sphinx-build -E -W -n -j auto -b html docs docs/_build/html
 
 .PHONY: sphinx
 sphinx:  ## run document build server

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36,37,py,py3}
+envlist = py{27,34,35,36,37,py,py3},sphinx-dev
 
 [testenv]
 whitelist_externals =
@@ -9,10 +9,18 @@ deps =
 commands =
   flake8 m2r.py setup.py tests
   coverage run -m unittest discover tests
-  coverage run -a -m sphinx -b html -d docs/_build/toctree -E -W -n -j 4 -q docs docs/_build/html
+  coverage run -a -m sphinx -b html -d docs/_build/toctree -E -W -n -j auto -q docs docs/_build/html
   coverage report
   make clean
 
+[testenv:sphinx-dev]
+recreate = true
+deps =
+  git+https://github.com/sphinx-doc/sphinx
+commands =
+  sphinx-build -b html -d docs/_build/toctree -E -W -n -j auto docs docs/_build/html
+  make clean
+
 [testenv:codecov]
 passenv = CI TRAVIS TRAVIS_*
 deps = codecov