Merge 7f726e0 into 6f591d0

.coveragerc

@@ -5,7 +5,6 @@ source =
 omit =
     .tox/*
     /usr/*
-    */tmp*
     setup.py
 
 [report]

.travis.yml

@@ -1,14 +1,15 @@
 language: python
-python: 3.6
-env: # These should match the tox env list
-    - TOXENV=py27
-    - TOXENV=py36
-    - TOXENV=pypy
+matrix:
+    include:
+        -   env: TOXENV=py27
+        -   env: TOXENV=py36
+            python: 3.6
+        -   env: TOXENV=pypy
+            python: pypy
 install: pip install coveralls tox
 script: tox
-after_success:
-    - coveralls
+after_success: coveralls
 cache:
     directories:
         - $HOME/.cache/pip
-        - $HOME/.pre-commit
+        - $HOME/.cache/pre-commit