Updated pymongo versions and pillow wont work

This commit is contained in:
Ross Lawley 2013-04-12 10:30:52 +00:00
parent b06f9dbf8d
commit cc5b60b004
2 changed files with 4 additions and 9 deletions

View File

@ -9,11 +9,11 @@ python:
- "3.3"
env:
- PYMONGO=dev
- PYMONGO=2.4.1
- PYMONGO=2.3
- PYMONGO=2.5
- PYMONGO=2.4.2
install:
- if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then cp /usr/lib/*/libz.so $VIRTUAL_ENV/lib/; fi
- if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install pillow --use-mirrors ; true; fi
- if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install pil --use-mirrors ; true; fi
- if [[ $PYMONGO == 'dev' ]]; then pip install https://github.com/mongodb/mongo-python-driver/tarball/master; true; fi
- if [[ $PYMONGO != 'dev' ]]; then pip install pymongo==$PYMONGO --use-mirrors; true; fi
- python setup.py install
@ -25,8 +25,3 @@ branches:
only:
- master
- "0.8"
# # Get development headers for PIL
# before_install:
# - sudo apt-get update -qq
# - sudo apt-get build-dep -qq python-imaging
# - sudo apt-get install libjpeg-dev

View File

@ -58,7 +58,7 @@ if sys.version_info[0] == 3:
extra_opts['packages'].append("tests")
extra_opts['package_data'] = {"tests": ["mongoengine.png"]}
else:
extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django=1.4.2', 'pillow']
extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django=1.4.2', 'PIL']
extra_opts['packages'] = find_packages(exclude=('tests',))
setup(name='mongoengine',