From 12b846586c4e72d712920d32e595146911c4f9e2 Mon Sep 17 00:00:00 2001 From: Emmanuel Leblond Date: Fri, 22 Dec 2017 13:23:03 +0100 Subject: [PATCH] Fix travis tests with mongodb 2.4 & pymongo 3 --- .travis.yml | 14 +++++++------- tox.ini | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78a9f787..a70c711e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ python: env: - MONGODB=2.6 PYMONGO=2.7 - MONGODB=2.6 PYMONGO=2.8 -- MONGODB=2.6 PYMONGO=3.0 +- MONGODB=2.6 PYMONGO=3.x matrix: # Finish the build as soon as one job fails @@ -31,19 +31,19 @@ matrix: - python: 2.7 env: MONGODB=2.4 PYMONGO=2.7 - python: 2.7 - env: MONGODB=2.4 PYMONGO=3.0 + env: MONGODB=2.4 PYMONGO=3.5 - python: 2.7 - env: MONGODB=3.0 PYMONGO=3.0 + env: MONGODB=3.0 PYMONGO=3.x - python: 3.5 env: MONGODB=2.4 PYMONGO=2.7 - python: 3.5 - env: MONGODB=2.4 PYMONGO=3.0 + env: MONGODB=2.4 PYMONGO=3.5 - python: 3.5 - env: MONGODB=3.0 PYMONGO=3.0 + env: MONGODB=3.0 PYMONGO=3.x - python: 3.6 - env: MONGODB=2.4 PYMONGO=3.0 + env: MONGODB=2.4 PYMONGO=3.5 - python: 3.6 - env: MONGODB=3.0 PYMONGO=3.0 + env: MONGODB=3.0 PYMONGO=3.x before_install: - bash .install_mongodb_on_travis.sh diff --git a/tox.ini b/tox.ini index 7f0d36e4..9bb0c5ec 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg30} +envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg35,mg3x} [testenv] commands = @@ -8,6 +8,7 @@ deps = nose mg27: PyMongo<2.8 mg28: PyMongo>=2.8,<2.9 - mg30: PyMongo>=3.0 + mg35: PyMongo==3.5 + mg3x: PyMongo>=3.0 setenv = PYTHON_EGG_CACHE = {envdir}/python-eggs