Merge branch 'master' into napoleon

Author: altendky

.travis.yml

@@ -5,9 +5,6 @@ env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
     - SEGFAULT_SIGNALS=all
-  matrix:
-    - TOXENV=check
-    - TOXENV=docs
 matrix:
   include:
     - python: '3.6'
@@ -17,7 +14,17 @@ matrix:
       dist: xenial
       sudo: required
       env:
-        - TOXENV=py37,report,codecov,doc
+        - TOXENV=py37,report,codecov
+    - python: '3.7'
+      dist: xenial
+      sudo: required
+      env:
+        - TOXENV=doc
+    - python: '3.7'
+      dist: xenial
+      sudo: required
+      env:
+        - TOXENV=check
 before_install:
   - python --version
   - uname -a

tox.ini

@@ -4,14 +4,14 @@
 envlist =
     clean,
     check,
-    docs,
+    doc,
     {py36,py37,pypy3},
     report
 
 [testenv]
 basepython =
     pypy3: {env:TOXPYTHON:pypy3}
-    {docs,spell}: {env:TOXPYTHON:python3.6}
+    {doc,spell}: {env:TOXPYTHON:python3.7}
     py36: {env:TOXPYTHON:python3.6}
     py37: {env:TOXPYTHON:python3.7}
     {bootstrap,clean,check,report,codecov}: {env:TOXPYTHON:python3}