From 2184a8a9b430ec069f85a6e4a63e3019bc0b8672 Mon Sep 17 00:00:00 2001 From: Christophe Bornet Date: Tue, 6 Nov 2018 11:37:50 +0100 Subject: [PATCH] [Flask] Upgrade to flask-connexion 2.0.0 (#1382) Fix #323 --- .../main/resources/flaskConnexion/requirements.mustache | 2 +- .../src/main/resources/flaskConnexion/setup.mustache | 7 ++++++- .../flaskConnexion-python2/.openapi-generator/VERSION | 2 +- .../petstore/flaskConnexion-python2/requirements.txt | 2 +- samples/server/petstore/flaskConnexion-python2/setup.py | 7 ++++++- .../petstore/flaskConnexion/.openapi-generator/VERSION | 2 +- samples/server/petstore/flaskConnexion/requirements.txt | 2 +- samples/server/petstore/flaskConnexion/setup.py | 6 +++++- 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/flaskConnexion/requirements.mustache b/modules/openapi-generator/src/main/resources/flaskConnexion/requirements.mustache index 3f4f2a782d15..2a194f98782a 100644 --- a/modules/openapi-generator/src/main/resources/flaskConnexion/requirements.mustache +++ b/modules/openapi-generator/src/main/resources/flaskConnexion/requirements.mustache @@ -1,4 +1,4 @@ -connexion == 2.0.0rc3 +connexion == 2.0.0 swagger-ui-bundle == 0.0.2 python_dateutil == 2.6.0 {{#supportPython2}} diff --git a/modules/openapi-generator/src/main/resources/flaskConnexion/setup.mustache b/modules/openapi-generator/src/main/resources/flaskConnexion/setup.mustache index 57a047e7bb0b..ef4c3bd3c0ac 100644 --- a/modules/openapi-generator/src/main/resources/flaskConnexion/setup.mustache +++ b/modules/openapi-generator/src/main/resources/flaskConnexion/setup.mustache @@ -13,7 +13,12 @@ VERSION = "{{packageVersion}}" # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["connexion"] +REQUIRES = [ + "connexion==2.0.0", + "swagger-ui-bundle==0.0.2", + "python_dateutil==2.6.0"{{#supportPython2}}, + "typing==3.5.2.2"{{/supportPython2}} +] setup( name=NAME, diff --git a/samples/server/petstore/flaskConnexion-python2/.openapi-generator/VERSION b/samples/server/petstore/flaskConnexion-python2/.openapi-generator/VERSION index f4cb97d56ce2..a65271290834 100644 --- a/samples/server/petstore/flaskConnexion-python2/.openapi-generator/VERSION +++ b/samples/server/petstore/flaskConnexion-python2/.openapi-generator/VERSION @@ -1 +1 @@ -3.3.1-SNAPSHOT \ No newline at end of file +3.3.2-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/flaskConnexion-python2/requirements.txt b/samples/server/petstore/flaskConnexion-python2/requirements.txt index 27cb3a2fb7fa..c764c056b3b6 100644 --- a/samples/server/petstore/flaskConnexion-python2/requirements.txt +++ b/samples/server/petstore/flaskConnexion-python2/requirements.txt @@ -1,4 +1,4 @@ -connexion == 2.0.0rc3 +connexion == 2.0.0 swagger-ui-bundle == 0.0.2 python_dateutil == 2.6.0 typing == 3.5.2.2 diff --git a/samples/server/petstore/flaskConnexion-python2/setup.py b/samples/server/petstore/flaskConnexion-python2/setup.py index c8796a1f6e2f..e18faf930bc5 100644 --- a/samples/server/petstore/flaskConnexion-python2/setup.py +++ b/samples/server/petstore/flaskConnexion-python2/setup.py @@ -13,7 +13,12 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["connexion"] +REQUIRES = [ + "connexion==2.0.0", + "swagger-ui-bundle==0.0.2", + "python_dateutil==2.6.0", + "typing==3.5.2.2" +] setup( name=NAME, diff --git a/samples/server/petstore/flaskConnexion/.openapi-generator/VERSION b/samples/server/petstore/flaskConnexion/.openapi-generator/VERSION index f4cb97d56ce2..a65271290834 100644 --- a/samples/server/petstore/flaskConnexion/.openapi-generator/VERSION +++ b/samples/server/petstore/flaskConnexion/.openapi-generator/VERSION @@ -1 +1 @@ -3.3.1-SNAPSHOT \ No newline at end of file +3.3.2-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/flaskConnexion/requirements.txt b/samples/server/petstore/flaskConnexion/requirements.txt index 0e74fd81c3e0..52aca69de9ac 100644 --- a/samples/server/petstore/flaskConnexion/requirements.txt +++ b/samples/server/petstore/flaskConnexion/requirements.txt @@ -1,4 +1,4 @@ -connexion == 2.0.0rc3 +connexion == 2.0.0 swagger-ui-bundle == 0.0.2 python_dateutil == 2.6.0 setuptools >= 21.0.0 diff --git a/samples/server/petstore/flaskConnexion/setup.py b/samples/server/petstore/flaskConnexion/setup.py index c8796a1f6e2f..9d7b02fbd90b 100644 --- a/samples/server/petstore/flaskConnexion/setup.py +++ b/samples/server/petstore/flaskConnexion/setup.py @@ -13,7 +13,11 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["connexion"] +REQUIRES = [ + "connexion==2.0.0", + "swagger-ui-bundle==0.0.2", + "python_dateutil==2.6.0" +] setup( name=NAME,