Merge branch 'master' into support-jsonify

Author: dcrosta

README.md

@@ -5,7 +5,7 @@ PyMongo support for Flask applications
 ## Quickstart
 
 ```python
-from flask import Flask
+from flask import Flask, render_template
 from flask_pymongo import PyMongo
 
 app = Flask(__name__)

azure-pipelines.yml

@@ -17,6 +17,8 @@ jobs:
     matrix:
       Python27:
         python.version: '2.7'
+      Python34:
+        python.version: '3.4'
       Python35:
         python.version: '3.5'
       Python36:

docs/index.rst

@@ -182,8 +182,12 @@ History and Contributors
 
 Changes:
 
-- 2.4.0: TBD
+- 2.4.0: Unreleased
 
+  - `#125 <https://github.com/dcrosta/flask-pymongo/pull/125>`_ Drop
+    MongoDB 3.2 support.
+  - `#130 <https://github.com/dcrosta/flask-pymongo/pull/130>`_ Fix
+    quickstart example in README (Emmanuel Arias).
   - `#62 <https://github.com/dcrosta/flask-pymongo/issues/62>`_ Add
     support for :func:`~flask.json.jsonify()`.
 

tox.ini

@@ -2,11 +2,10 @@
 
 ; keep the pymongo list in sync with what's in .travis.yaml
 envlist=
-    pymongo{33,34,35,36,37,38}-mongo{32,34,36,40,41}-flask{0_11,0_12,10}, style
+    pymongo{33,34,35,36,37,38}-mongo{34,36,40,41}-flask{0_11,0_12,10}, style
 
 [testenv]
 docker =
-    mongo32: mongo:3.2
     mongo34: mongo:3.4
     mongo36: mongo:3.6
     mongo40: mongo:4.0