Travis travis travis

This commit is contained in:
Ross Lawley 2013-04-12 10:02:55 +00:00
parent d9b8ee7895
commit b06f9dbf8d
2 changed files with 2 additions and 2 deletions

View File

@ -13,7 +13,7 @@ env:
- PYMONGO=2.3 - PYMONGO=2.3
install: install:
- if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then cp /usr/lib/*/libz.so $VIRTUAL_ENV/lib/; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then cp /usr/lib/*/libz.so $VIRTUAL_ENV/lib/; fi
- if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install pil --use-mirrors ; true; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install pillow --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 https://github.com/mongodb/mongo-python-driver/tarball/master; true; fi
- if [[ $PYMONGO != 'dev' ]]; then pip install pymongo==$PYMONGO --use-mirrors; true; fi - if [[ $PYMONGO != 'dev' ]]; then pip install pymongo==$PYMONGO --use-mirrors; true; fi
- python setup.py install - python setup.py install

View File

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