loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-09 22:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Python: Flask: Fix: Update setup.py to match requirements.txt (#4205)

Browse Source 
* Python: Flask: Fix: Update setup.py to match requirements.txt

* Regenerate samples python-flask & python-flask-python2
This commit is contained in:
Guillaume SMAHA
2019-10-21 20:57:54 -04:00
committed by William Cheng
parent a38527d8b6
commit 5d7bb17cc6
18 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openapi-generator/src/main/resources/python-flask/setup.mustache vendored
View File

@@ -14,10 +14,10 @@ VERSION = "{{packageVersion}}"
# http://pypi.python.org/pypi/setuptools # http://pypi.python.org/pypi/setuptools
REQUIRES = [ REQUIRES = [
"connexion==2.0.0", "connexion>=2.0.2",
"swagger-ui-bundle==0.0.2", "swagger-ui-bundle>=0.0.2",
"python_dateutil==2.6.0"{{#supportPython2}}, "python_dateutil>=2.6.0"{{#supportPython2}},
"typing==3.5.2.2"{{/supportPython2}} "typing>=3.5.2.2"{{/supportPython2}}
] ]
setup( setup(

2
samples/openapi3/server/petstore/python-flask-python2/.openapi-generator/VERSION
View File

@@ -1 +1 @@
4.1.0-SNAPSHOT 4.2.0-SNAPSHOT

14
samples/openapi3/server/petstore/python-flask-python2/git_push.sh
View File

@@ -1,11 +1,17 @@
#!/bin/sh #!/bin/sh
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
# #
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" # Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
git_user_id=$1 git_user_id=$1
git_repo_id=$2 git_repo_id=$2
release_note=$3 release_note=$3
git_host=$4
if [ "$git_host" = "" ]; then
git_host="github.com"
echo "[INFO] No command line input provided. Set \$git_host to $git_host"
fi
if [ "$git_user_id" = "" ]; then if [ "$git_user_id" = "" ]; then
git_user_id="GIT_USER_ID" git_user_id="GIT_USER_ID"
@@ -37,9 +43,9 @@ if [ "$git_remote" = "" ]; then # git remote not defined
if [ "$GIT_TOKEN" = "" ]; then if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
else else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
fi fi
fi fi
@@ -47,6 +53,6 @@ fi
git pull origin master git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository # Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git" echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https' git push origin master 2>&1 | grep -v 'To https'

4
samples/openapi3/server/petstore/python-flask-python2/openapi_server/controllers/pet_controller.py
View File

@@ -49,15 +49,13 @@ def find_pets_by_status(status): # noqa: E501
return 'do some magic!' return 'do some magic!'
def find_pets_by_tags(tags, max_count=None): # noqa: E501 def find_pets_by_tags(tags): # noqa: E501
"""Finds Pets by tags """Finds Pets by tags
Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. # noqa: E501 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. # noqa: E501
:param tags: Tags to filter by :param tags: Tags to filter by
:type tags: List[str] :type tags: List[str]
:param max_count: Maximum number of items to return
:type max_count: int
:rtype: List[Pet] :rtype: List[Pet]
""" """

9
samples/openapi3/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml
View File

@@ -115,15 +115,6 @@ paths:
type: string type: string
type: array type: array
style: form style: form
- description: Maximum number of items to return
explode: true
in: query
name: maxCount
required: false
schema:
format: int32
type: integer
style: form
responses: responses:
200: 200:
content: content:

3
samples/openapi3/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py
View File

@@ -89,8 +89,7 @@ class TestPetController(BaseTestCase):
Finds Pets by tags Finds Pets by tags
""" """
query_string = [('tags', 'tags_example'), query_string = [('tags', 'tags_example')]
('maxCount', 56)]
headers = { headers = {
'Accept': 'application/json', 'Accept': 'application/json',
'Authorization': 'Bearer special-key', 'Authorization': 'Bearer special-key',

2
samples/openapi3/server/petstore/python-flask-python2/openapi_server/util.py
View File

@@ -16,7 +16,7 @@ def _deserialize(data, klass):
if data is None: if data is None:
return None return None
if klass in six.integer_types or klass in (float, str, bool): if klass in six.integer_types or klass in (float, str, bool, bytearray):
return _deserialize_primitive(data, klass) return _deserialize_primitive(data, klass)
elif klass == object: elif klass == object:
return _deserialize_object(data) return _deserialize_object(data)

8
samples/openapi3/server/petstore/python-flask-python2/setup.py
View File

@@ -14,10 +14,10 @@ VERSION = "1.0.0"
# http://pypi.python.org/pypi/setuptools # http://pypi.python.org/pypi/setuptools
REQUIRES = [ REQUIRES = [
"connexion==2.0.0", "connexion>=2.0.2",
"swagger-ui-bundle==0.0.2", "swagger-ui-bundle>=0.0.2",
"python_dateutil==2.6.0", "python_dateutil>=2.6.0",
"typing==3.5.2.2" "typing>=3.5.2.2"
] ]
setup( setup(

2
samples/openapi3/server/petstore/python-flask/.openapi-generator/VERSION
View File

@@ -1 +1 @@
4.1.0-SNAPSHOT 4.2.0-SNAPSHOT

14
samples/openapi3/server/petstore/python-flask/git_push.sh
View File

@@ -1,11 +1,17 @@
#!/bin/sh #!/bin/sh
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
# #
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" # Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
git_user_id=$1 git_user_id=$1
git_repo_id=$2 git_repo_id=$2
release_note=$3 release_note=$3
git_host=$4
if [ "$git_host" = "" ]; then
git_host="github.com"
echo "[INFO] No command line input provided. Set \$git_host to $git_host"
fi
if [ "$git_user_id" = "" ]; then if [ "$git_user_id" = "" ]; then
git_user_id="GIT_USER_ID" git_user_id="GIT_USER_ID"
@@ -37,9 +43,9 @@ if [ "$git_remote" = "" ]; then # git remote not defined
if [ "$GIT_TOKEN" = "" ]; then if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
else else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
fi fi
fi fi
@@ -47,6 +53,6 @@ fi
git pull origin master git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository # Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git" echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https' git push origin master 2>&1 | grep -v 'To https'

6
samples/openapi3/server/petstore/python-flask/setup.py
View File

@@ -14,9 +14,9 @@ VERSION = "1.0.0"
# http://pypi.python.org/pypi/setuptools # http://pypi.python.org/pypi/setuptools
REQUIRES = [ REQUIRES = [
"connexion==2.0.0", "connexion>=2.0.2",
"swagger-ui-bundle==0.0.2", "swagger-ui-bundle>=0.0.2",
"python_dateutil==2.6.0" "python_dateutil>=2.6.0"
] ]
setup( setup(

2
samples/server/petstore/python-flask-python2/.openapi-generator/VERSION
View File

@@ -1 +1 @@
4.1.0-SNAPSHOT 4.2.0-SNAPSHOT

14
samples/server/petstore/python-flask-python2/git_push.sh
View File

@@ -1,11 +1,17 @@
#!/bin/sh #!/bin/sh
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
# #
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" # Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
git_user_id=$1 git_user_id=$1
git_repo_id=$2 git_repo_id=$2
release_note=$3 release_note=$3
git_host=$4
if [ "$git_host" = "" ]; then
git_host="github.com"
echo "[INFO] No command line input provided. Set \$git_host to $git_host"
fi
if [ "$git_user_id" = "" ]; then if [ "$git_user_id" = "" ]; then
git_user_id="GIT_USER_ID" git_user_id="GIT_USER_ID"
@@ -37,9 +43,9 @@ if [ "$git_remote" = "" ]; then # git remote not defined
if [ "$GIT_TOKEN" = "" ]; then if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
else else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
fi fi
fi fi
@@ -47,6 +53,6 @@ fi
git pull origin master git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository # Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git" echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https' git push origin master 2>&1 | grep -v 'To https'

2
samples/server/petstore/python-flask-python2/openapi_server/util.py
View File

@@ -16,7 +16,7 @@ def _deserialize(data, klass):
if data is None: if data is None:
return None return None
if klass in six.integer_types or klass in (float, str, bool): if klass in six.integer_types or klass in (float, str, bool, bytearray):
return _deserialize_primitive(data, klass) return _deserialize_primitive(data, klass)
elif klass == object: elif klass == object:
return _deserialize_object(data) return _deserialize_object(data)

8
samples/server/petstore/python-flask-python2/setup.py
View File

@@ -14,10 +14,10 @@ VERSION = "1.0.0"
# http://pypi.python.org/pypi/setuptools # http://pypi.python.org/pypi/setuptools
REQUIRES = [ REQUIRES = [
"connexion==2.0.0", "connexion>=2.0.2",
"swagger-ui-bundle==0.0.2", "swagger-ui-bundle>=0.0.2",
"python_dateutil==2.6.0", "python_dateutil>=2.6.0",
"typing==3.5.2.2" "typing>=3.5.2.2"
] ]
setup( setup(

2
samples/server/petstore/python-flask/.openapi-generator/VERSION
View File

@@ -1 +1 @@
4.1.0-SNAPSHOT 4.2.0-SNAPSHOT

14
samples/server/petstore/python-flask/git_push.sh
View File

@@ -1,11 +1,17 @@
#!/bin/sh #!/bin/sh
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
# #
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" # Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
git_user_id=$1 git_user_id=$1
git_repo_id=$2 git_repo_id=$2
release_note=$3 release_note=$3
git_host=$4
if [ "$git_host" = "" ]; then
git_host="github.com"
echo "[INFO] No command line input provided. Set \$git_host to $git_host"
fi
if [ "$git_user_id" = "" ]; then if [ "$git_user_id" = "" ]; then
git_user_id="GIT_USER_ID" git_user_id="GIT_USER_ID"
@@ -37,9 +43,9 @@ if [ "$git_remote" = "" ]; then # git remote not defined
if [ "$GIT_TOKEN" = "" ]; then if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
else else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
fi fi
fi fi
@@ -47,6 +53,6 @@ fi
git pull origin master git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository # Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git" echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https' git push origin master 2>&1 | grep -v 'To https'

6
samples/server/petstore/python-flask/setup.py
View File

@@ -14,9 +14,9 @@ VERSION = "1.0.0"
# http://pypi.python.org/pypi/setuptools # http://pypi.python.org/pypi/setuptools
REQUIRES = [ REQUIRES = [
"connexion==2.0.0", "connexion>=2.0.2",
"swagger-ui-bundle==0.0.2", "swagger-ui-bundle>=0.0.2",
"python_dateutil==2.6.0" "python_dateutil>=2.6.0"
] ]
setup( setup(