summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-03-12 17:42:07 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-03-12 17:42:07 -0700
commitddf38084317a9f852ae3bdf715e6645b4ba6004d (patch)
tree3082c7989e83712f33d10798ccfa976e68281930
parentf2f342b6f59e86e7005d03bc56eb2b03161f5f39 (diff)
parentdb4011125bd6aeb5116adb2675f6a52c135940bd (diff)
Merge branch '2.1' into 2.2
-rw-r--r--.travis.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index bb0ed5ab..2819eb20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,10 @@ python:
- "3.6"
- "3.7-dev"
- "pypy-5.6.0"
+matrix:
+ allow_failures:
+ - python: "3.7-dev"
+ - python: "pypy-5.6.0"
install:
# Ensure modern pip/etc on Python 3.3 workers (not sure WTF, but, eh)
- pip install pip==9.0.1 setuptools==36.6.0