From 59fbd505a04dd8cf822a098b834fdd8829395fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20G=C3=A9rard?= Date: Sun, 5 Jan 2020 20:20:13 +0100 Subject: [PATCH 1/2] include latest pymongo version in travis --- .travis.yml | 7 +++++-- setup.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 809fbad8..a299eea9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,11 +33,12 @@ env: global: - MONGODB_3_4=3.4.17 - MONGODB_3_6=3.6.12 + - PYMONGO_3_10=3.10 - PYMONGO_3_9=3.9 - PYMONGO_3_6=3.6 - PYMONGO_3_4=3.4 matrix: - - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_9} + - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_10} matrix: @@ -51,6 +52,8 @@ matrix: env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6} - python: 3.7 env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9} + - python: 3.7 + env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_10} install: # Install Mongo @@ -110,5 +113,5 @@ deploy: on: tags: true repo: MongoEngine/mongoengine - condition: ($PYMONGO = ${PYMONGO_3_9}) && ($MONGODB = ${MONGODB_3_4}) + condition: ($PYMONGO = ${PYMONGO_3_10}) && ($MONGODB = ${MONGODB_3_4}) python: 2.7 diff --git a/setup.py b/setup.py index 6c3ef8db..5ba84e06 100644 --- a/setup.py +++ b/setup.py @@ -143,7 +143,7 @@ setup( long_description=LONG_DESCRIPTION, platforms=["any"], classifiers=CLASSIFIERS, - install_requires=["pymongo>=3.4", "six>=1.10.0"], + install_requires=["pymongo>=3.4, <4.0", "six>=1.10.0"], cmdclass={"test": PyTest}, **extra_opts ) From 705c55ce24c006dd2bd06437f3d7fb945ed1de17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20G=C3=A9rard?= Date: Sun, 5 Jan 2020 20:30:56 +0100 Subject: [PATCH 2/2] update tox file to account for mg310 --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 349b5577..a3d2df60 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,7 @@ commands = deps = mg34: pymongo>=3.4,<3.5 mg36: pymongo>=3.6,<3.7 - mg39: pymongo>=3.9,<4.0 + mg39: pymongo>=3.9,<3.10 + mg310: pymongo>=3.10,<3.11 setenv = PYTHON_EGG_CACHE = {envdir}/python-eggs