fixes in .travis.yml and tox.ini based on PR review

This commit is contained in:
Bastien Gérard 2019-07-02 23:06:31 +02:00
parent babfbb0fcd
commit e940044603
2 changed files with 6 additions and 6 deletions

View File

@ -32,10 +32,10 @@ env:
global: global:
- MONGODB_3_4=3.4.17 - MONGODB_3_4=3.4.17
- MONGODB_3_6=3.6.12 - MONGODB_3_6=3.6.12
- PYMONGO_3_X=3.x - PYMONGO_3_6=3.6
- PYMONGO_3_4=3.4.x - PYMONGO_3_4=3.4.x
matrix: matrix:
- MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_X} - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_6}
matrix: matrix:
@ -46,7 +46,7 @@ matrix:
- python: 2.7 - python: 2.7
env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4} env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4}
- python: 3.7 - python: 3.7
env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_X} env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
install: install:
@ -107,5 +107,5 @@ deploy:
on: on:
tags: true tags: true
repo: MongoEngine/mongoengine repo: MongoEngine/mongoengine
condition: ($PYMONGO = ${PYMONGO_3_X}) && ($MONGODB = ${MONGODB_3_4}) condition: ($PYMONGO = ${PYMONGO_3_6}) && ($MONGODB = ${MONGODB_3_4})
python: 2.7 python: 2.7

View File

@ -6,7 +6,7 @@ commands =
python setup.py nosetests {posargs} python setup.py nosetests {posargs}
deps = deps =
nose nose
mg34x: PyMongo>=3.4,<3.5 mg34: pymongo>=3.4,<3.5
mg3x: PyMongo>=3.0,<3.7 mg36: pymongo>=3.6,<3.7
setenv = setenv =
PYTHON_EGG_CACHE = {envdir}/python-eggs PYTHON_EGG_CACHE = {envdir}/python-eggs