From 06a21e038addd4ac05e36acb5f2bfa810cf59209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 30 Jun 2019 21:03:13 +0200
Subject: [PATCH 1/3] Use global constants for mongo/pymongo in travis.yml

---
 .travis.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8af73c6b..0aba2ae8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,10 @@ env:
   global:
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
+    - PYMONGO_3_X=3.x
+    - PYMONGO_3_4=3.4.x
   matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=3.x
+    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_X}
 
 matrix:
 
@@ -40,11 +42,11 @@ matrix:
 
   include:
   - python: 2.7
-    env: MONGODB=${MONGODB_3_4} PYMONGO=3.4.x
+    env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4}
   - python: 3.6
-    env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_X}
   - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_X}
 
 
 install:
@@ -105,5 +107,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = 3.x) && ($MONGODB = 3.4.17)
+    condition: ($PYMONGO = ${PYMONGO_3_X}) && ($MONGODB = ${MONGODB_3_4})
     python: 2.7

From e9400446030ecc29fede088a7abe2c501a737b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 2 Jul 2019 23:06:31 +0200
Subject: [PATCH 2/3] fixes in  .travis.yml and tox.ini based on PR review

---
 .travis.yml | 8 ++++----
 tox.ini     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4021cb8f..34acd952 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,10 @@ env:
   global:
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
-    - PYMONGO_3_X=3.x
+    - PYMONGO_3_6=3.6
     - PYMONGO_3_4=3.4.x
   matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_X}
+    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_6}
 
 matrix:
 
@@ -46,7 +46,7 @@ matrix:
   - python: 2.7
     env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4}
   - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_X}
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
 
 
 install:
@@ -107,5 +107,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = ${PYMONGO_3_X}) && ($MONGODB = ${MONGODB_3_4})
+    condition: ($PYMONGO = ${PYMONGO_3_6}) && ($MONGODB = ${MONGODB_3_4})
     python: 2.7
diff --git a/tox.ini b/tox.ini
index 40bcea8a..5e62e58b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ commands =
     python setup.py nosetests {posargs}
 deps =
     nose
-    mg34x: PyMongo>=3.4,<3.5
-    mg3x: PyMongo>=3.0,<3.7
+    mg34: pymongo>=3.4,<3.5
+    mg36: pymongo>=3.6,<3.7
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 951a532a9f30693903fa41ad3ec9cbe2cf0f7790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 3 Jul 2019 09:15:28 +0200
Subject: [PATCH 3/3] additional fix in travis/tox

---
 .travis.yml | 2 +-
 tox.ini     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 34acd952..54a6befd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ env:
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
     - PYMONGO_3_6=3.6
-    - PYMONGO_3_4=3.4.x
+    - PYMONGO_3_4=3.4
   matrix:
     - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_6}
 
diff --git a/tox.ini b/tox.ini
index 5e62e58b..a1ae8444 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,pypy,pypy3}-{mg35,mg3x}
+envlist = {py27,py35,pypy,pypy3}-{mg34,mg36}
 
 [testenv]
 commands =