Update .travis.yml to trunk version.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/.travis.yml b/.travis.yml
index fd341fbf33f4e7c3c8115a5835cb3b8f8b19562f..1c0a256edc09cdb549c5083ae8e2d00cbd234e72 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,21 @@
+sudo: false
 language: python
 python:
   - "2.7"
   - "2.6"
+  - "pypy"
 before_install:
   - sh -c set
-install: true
-before_script: python misc/build_helpers/show-tool-versions.py
-script: python setup.py test --reporter=timing
+  - git config --global user.email "travis-tahoe@tahoe-lafs.org"
+  - git config --global user.name "Travis Tahoe"
+  - git fetch --depth=1000
+  - python misc/build_helpers/show-tool-versions.py
+install:
+  - 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:
+  coveralls
 notifications:
   email: false
   irc:
@@ -16,3 +25,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