Merge branch '2.x'

Author: davidism

.codecov.yml

@@ -1,13 +1,14 @@
 .DS_Store
 *.pyc
 *.pyo
-*.egg-info
+*.egg-info/
 dist/
 build/
-docs/_build
+docs/_build/
 .tox/
 .idea/
-.cache/
-htmlcov
+.pytest_cache/
+htmlcov/
 .coverage
 .coverage.*
+.vscode/

.coveragerc

@@ -1,31 +1,39 @@
-sudo: false
+os: linux
+dist: xenial
 language: python
+env: TOXENV=py,codecov
 
 matrix:
+  fast_finish: true
   include:
-    - python: 3.6
-      env: TOXENV=py,codecov
-    - python: 3.5
-      env: TOXENV=py,codecov
-    - python: 3.4
-      env: TOXENV=py,codecov
     - python: 2.7
-      env: TOXENV=py,codecov
-    - python: pypy
-      env: TOXENV=py,codecov
-    - python: nightly
-      env: TOXENV=py,codecov
+      env: TOXENV=py,py27-lowest,codecov
+    - python: 3.4
+    - python: 3.5
     - python: 3.6
-      env: TOXENV=docs_html
+      env: TOXENV=py,py36-lowest,codecov
+    - python: 3.7
+      env: TOXENV=py,py37-lowest,codecov
+    - python: 3.7
+      env: TOXENV=docs
+    - python: nightly
+    - python: pypy3.5-6.0
+  allow_failures:
+    # Why test these at all if they aren't going to fail the build?  Answered at:
+    # https://github.com/pallets/flask-sqlalchemy/issues/689
+    - python: nightly
+    - python: pypy3.5-6.0
 
 install:
-  - pip install tox
+  - pip install -U tox
 
 script:
-  - tox
+  - tox --skip-missing-interpreters false
 
 cache:
-  - pip
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.cache/pre-commit
 
 branches:
   only:
@@ -34,10 +42,3 @@ branches:
 
 notifications:
   email: false
-  irc:
-    channels:
-      - "chat.freenode.net#pocoo"
-    on_success: change
-    on_failure: always
-    use_notice: true
-    skip_join: true