Merge branch 'master' into 0.8

This commit is contained in:
Ross Lawley 2012-12-19 12:38:04 +00:00
commit 4a57fc33e4

View File

@ -9,8 +9,8 @@ python:
- 3.2 - 3.2
env: env:
- PYMONGO=dev - PYMONGO=dev
- PYMONGO=2.4.1
- PYMONGO=2.3 - PYMONGO=2.3
- PYMONGO=2.2
install: install:
- if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then sudo apt-get install zlib1g zlib1g-dev; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then sudo apt-get install zlib1g zlib1g-dev; fi
- if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then sudo ln -s /usr/lib/i386-linux-gnu/libz.so /usr/lib/; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then sudo ln -s /usr/lib/i386-linux-gnu/libz.so /usr/lib/; fi