merge latest master + test pymongo v2.8 instead of v2.9 + drop dev pymongo + smarter pypi deployment

2017-02-25 16:54:46 -05:00
parent ce7142eb4f e93a95d0cb
commit 0ea1dfddaa
79 changed files with 4805 additions and 2918 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,20 @@
 [tox]
-envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28}
-#envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30,mgdev}
+envlist = {py27,py33,py34,py35,pypy,pypy3}-{mg27,mg28,mg30},flake8

 [testenv]
 commands =
    python setup.py nosetests {posargs}
 deps =
+    nose
    mg27: PyMongo<2.8
-    mg28: PyMongo>=2.8,<3.0
+    mg28: PyMongo>=2.8,<2.9
    mg30: PyMongo>=3.0
-    mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
+setenv =
+    PYTHON_EGG_CACHE = {envdir}/python-eggs
+
+[testenv:flake8]
+deps =
+    flake8
+    flake8-import-order
+commands =
+   flake8