Merge remote-tracking branch 'origin/master' into 5.0-sync-master

samples/server/petstore/python-flask/.openapi-generator/VERSION

@@ -1 +1,5 @@
-5.0.0-SNAPSHOT
+<<<<<<< HEAD
+5.0.0-SNAPSHOT
+=======
+4.3.1-SNAPSHOT
+>>>>>>> origin/master

samples/server/petstore/python-flask/requirements.txt

@@ -1,7 +1,10 @@
-connexion >= 2.5.0; python_version>="3.6"
-connexion >= 2.3.0; python_version=="3.5"
-connexion >= 2.3.0; python_version=="3.4"
-connexion == 2.4.0; python_version<="2.7"
+connexion[swagger-ui] >= 2.6.0; python_version>="3.6"
+# 2.3 is the last version that supports python 3.4-3.5
+connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4"
+# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug
+# we must peg werkzeug versions below to fix connexion
+# https://github.com/zalando/connexion/pull/1044
+werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4"
 swagger-ui-bundle >= 0.0.2
 python_dateutil >= 2.6.0
 setuptools >= 21.0.0

samples/server/petstore/python-flask/test-requirements.txt

@@ -1,4 +1,4 @@
 pytest~=4.6.7 # needed for python 2.7+3.4
 pytest-cov>=2.8.1
 pytest-randomly==1.2.3 # needed for python 2.7+3.4
-flask_testing==0.6.1
+Flask-Testing==0.8.0

samples/server/petstore/python-flask/tox.ini

@@ -1,9 +1,11 @@
 [tox]
 envlist = py3
+skipsdist=True
 
 [testenv]
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
 
 commands=
-   pytest --cov=openapi_server
+   pytest --cov=openapi_server