pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1717 from touilleMan/fix-pymongo-mongodb2.4

Browse Source 
Fix travis tests with mongodb 2.4 & pymongo 3
This commit is contained in:
Emmanuel Leblond 2017-12-22 16:19:14 +01:00 committed by GitHub
commit d3c3c23630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -21,7 +21,7 @@ python:
env: env:
- MONGODB=2.6 PYMONGO=2.7 - MONGODB=2.6 PYMONGO=2.7
- MONGODB=2.6 PYMONGO=2.8 - MONGODB=2.6 PYMONGO=2.8
- MONGODB=2.6 PYMONGO=3.0 - MONGODB=2.6 PYMONGO=3.x
matrix: matrix:
# Finish the build as soon as one job fails # Finish the build as soon as one job fails
@ -31,19 +31,19 @@ matrix:
- python: 2.7 - python: 2.7
env: MONGODB=2.4 PYMONGO=2.7 env: MONGODB=2.4 PYMONGO=2.7
- python: 2.7 - python: 2.7
env: MONGODB=2.4 PYMONGO=3.0 env: MONGODB=2.4 PYMONGO=3.5
- python: 2.7 - python: 2.7
env: MONGODB=3.0 PYMONGO=3.0 env: MONGODB=3.0 PYMONGO=3.x
- python: 3.5 - python: 3.5
env: MONGODB=2.4 PYMONGO=2.7 env: MONGODB=2.4 PYMONGO=2.7
- python: 3.5 - python: 3.5
env: MONGODB=2.4 PYMONGO=3.0 env: MONGODB=2.4 PYMONGO=3.5
- python: 3.5 - python: 3.5
env: MONGODB=3.0 PYMONGO=3.0 env: MONGODB=3.0 PYMONGO=3.x
- python: 3.6 - python: 3.6
env: MONGODB=2.4 PYMONGO=3.0 env: MONGODB=2.4 PYMONGO=3.5
- python: 3.6 - python: 3.6
env: MONGODB=3.0 PYMONGO=3.0 env: MONGODB=3.0 PYMONGO=3.x
before_install: before_install:
- bash .install_mongodb_on_travis.sh - bash .install_mongodb_on_travis.sh

5
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg30} envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg35,mg3x}
[testenv] [testenv]
commands = commands =
@ -8,6 +8,7 @@ deps =
nose nose
mg27: PyMongo<2.8 mg27: PyMongo<2.8
mg28: PyMongo>=2.8,<2.9 mg28: PyMongo>=2.8,<2.9
mg30: PyMongo>=3.0 mg35: PyMongo==3.5
mg3x: PyMongo>=3.0
setenv = setenv =
PYTHON_EGG_CACHE = {envdir}/python-eggs PYTHON_EGG_CACHE = {envdir}/python-eggs