From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 6 Jul 2013 11:41:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'mgax/pytest'
X-Git-Tag: 1.0~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d42286129c30420ad60558214773e270d2907b6c;p=thirdparty%2Fbabel.git

Merge remote-tracking branch 'mgax/pytest'
---

d42286129c30420ad60558214773e270d2907b6c
diff --cc .travis.yml
index 316cdbe1,4f61b347..a4487056
--- a/.travis.yml
+++ b/.travis.yml
@@@ -6,6 -6,7 +6,7 @@@ python
    - "pypy"
  
  install:
 -  - pip install pytz pytest
++  - pip install pytest
    - pip install --editable .
  
  script: make test