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
commite7f03dc4c3acfbecd49ace4faa14018714a9cc94 (patch)
tree7787807cbad3debcbc83f9c2ed2ce4950befafec
parent841896cf4f6ca734ada0b5436109585f32335edd (diff)
parentddf38084317a9f852ae3bdf715e6645b4ba6004d (diff)
Merge branch '2.2' into 2.3
-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