X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=.travis.yml;h=5df0e85d78815660f829ea00132041f5afca6997;hb=refs%2Fheads%2F2438.magic-folder-stable.7;hp=5e7915360c9aeee46f8833ba20a2b51ab8d84b56;hpb=ce7a867b22ede846f215e5977e16aef8caa8c197;p=tahoe-lafs%2Ftahoe-lafs.git

diff --git a/.travis.yml b/.travis.yml
index 5e791536..5df0e85d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,16 @@
+sudo: false
 language: python
 python:
   - "2.7"
-  - "2.6"
-sudo: false
+  - "pypy"
 before_install:
   - sh -c set
   - git config --global user.email "travis-tahoe@tahoe-lafs.org"
   - git config --global user.name "Travis Tahoe"
-  - git pull --depth=1000
+  - git fetch --depth=1000
   - python misc/build_helpers/show-tool-versions.py
 install:
-  - pip install 'coveralls==0.4.2'
+  - pip install coverage coveralls
 before_script: python setup.py build
 script: bin/tahoe @coverage run --branch --source=src/allmydata @tahoe --version-and-path debug trial --rterrors --reporter=timing
 after_success:
@@ -24,3 +24,7 @@ notifications:
     template:
       - "%{repository}#%{build_number} [%{branch}: %{commit} by %{author}] %{message}"
       - "Changes: %{compare_url} | Details: %{build_url}"
+matrix:
+  allow_failures:
+    - python: "pypy"
+  fast_finish: true