summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-05-16 17:06:15 -0400
committerJeff Forcier <jeff@bitprophet.org>2018-05-16 17:06:15 -0400
commit413bf37df7c9bf88d70d2b046935687c072980d4 (patch)
treeaec9e00a867f94f7969ca63123d0cdd30fb9fa8d
parent81d9dd8240d947500452337e29579de31b113b6b (diff)
parent52551321a2297bdb966869fa719e584c868dd857 (diff)
Merge branch '2.4'
-rw-r--r--.travis.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 5823ebd6..4316bd9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,6 @@ python:
matrix:
allow_failures:
- python: "3.7-dev"
- - python: "pypy-5.6.0"
install:
# Ensure modern pip/etc to avoid some issues w/ older worker environs
- pip install pip==9.0.1 setuptools==36.6.0