Merge pull request #187 from tahoe-lafs/2493.cleanup-osx-packaging.1

[tahoe-lafs/tahoe-lafs.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 136436806eda699fe03495bc64e68ec109485479..484e502614f2b44bd63c19420dc105fcbbc89a1b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,14 @@ language: python
 python:
   - "2.7"
   - "2.6"
+  - "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
   - python misc/build_helpers/show-tool-versions.py
 install:
-  - pip install 'twisted>=0.13.0'
   - pip install 'coveralls==0.4.2'
 before_script: python setup.py build
 script: bin/tahoe @coverage run --branch --source=src/allmydata @tahoe --version-and-path debug trial --rterrors --reporter=timing
@@ -22,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