Merge branch 'master' of github.com:MongoEngine/mongoengine into mongodb_40

2020-01-12 21:16:48 +01:00
parent b61c8cd104 9490ad2bf7
commit ea88806630
76 changed files with 5215 additions and 4899 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -3,11 +3,11 @@ envlist = {py27,py35,pypy,pypy3}-{mg34,mg36, mg39}

 [testenv]
 commands =
-    python setup.py nosetests {posargs}
+    python setup.py test {posargs}
 deps =
-    nose
    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