From 73e277ff2c49263b6176283b655d6f91bc96707d Mon Sep 17 00:00:00 2001 From: Sai Giridhar P Date: Wed, 30 Oct 2019 12:43:25 +0530 Subject: [PATCH 1/4] fix(license): Fixing the license and author information --- .../openapi-generator/src/main/resources/python/setup.mustache | 2 ++ samples/client/petstore/python-asyncio/setup.py | 2 ++ samples/client/petstore/python/setup.py | 2 ++ samples/openapi3/client/petstore/python/setup.py | 2 ++ 4 files changed, 8 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/python/setup.mustache b/modules/openapi-generator/src/main/resources/python/setup.mustache index 588851cc7b0a..3f314b83468e 100644 --- a/modules/openapi-generator/src/main/resources/python/setup.mustache +++ b/modules/openapi-generator/src/main/resources/python/setup.mustache @@ -28,12 +28,14 @@ setup( name=NAME, version=VERSION, description="{{appName}}", + author="{{infoName}}", author_email="{{infoEmail}}", url="{{packageUrl}}", keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"], install_requires=REQUIRES, packages=find_packages(exclude=["test", "tests"]), include_package_data=True, + license="{{licenseInfo}}", long_description="""\ {{appDescription}} # noqa: E501 """ diff --git a/samples/client/petstore/python-asyncio/setup.py b/samples/client/petstore/python-asyncio/setup.py index bf6cb115fc6f..195700689fe1 100644 --- a/samples/client/petstore/python-asyncio/setup.py +++ b/samples/client/petstore/python-asyncio/setup.py @@ -28,12 +28,14 @@ name=NAME, version=VERSION, description="OpenAPI Petstore", + author="", author_email="", url="", keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"], install_requires=REQUIRES, packages=find_packages(exclude=["test", "tests"]), include_package_data=True, + license="Apache-2.0", long_description="""\ This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 """ diff --git a/samples/client/petstore/python/setup.py b/samples/client/petstore/python/setup.py index 1d5e7c2915ef..177f3c51536c 100644 --- a/samples/client/petstore/python/setup.py +++ b/samples/client/petstore/python/setup.py @@ -27,12 +27,14 @@ name=NAME, version=VERSION, description="OpenAPI Petstore", + author="", author_email="", url="", keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"], install_requires=REQUIRES, packages=find_packages(exclude=["test", "tests"]), include_package_data=True, + license="Apache-2.0", long_description="""\ This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 """ diff --git a/samples/openapi3/client/petstore/python/setup.py b/samples/openapi3/client/petstore/python/setup.py index 1d5e7c2915ef..177f3c51536c 100644 --- a/samples/openapi3/client/petstore/python/setup.py +++ b/samples/openapi3/client/petstore/python/setup.py @@ -27,12 +27,14 @@ name=NAME, version=VERSION, description="OpenAPI Petstore", + author="", author_email="", url="", keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"], install_requires=REQUIRES, packages=find_packages(exclude=["test", "tests"]), include_package_data=True, + license="Apache-2.0", long_description="""\ This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 """ From 762e20e72745867b3883d34255b5ac2cf8f55a02 Mon Sep 17 00:00:00 2001 From: Sai Giridhar P Date: Wed, 30 Oct 2019 13:46:02 +0530 Subject: [PATCH 2/4] fix(license): Fixing the license and author information --- .../main/resources/python/python-experimental/setup.mustache | 2 ++ samples/client/petstore/python-tornado/setup.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache index 80006ded1608..ac60e22afebe 100644 --- a/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache +++ b/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache @@ -29,6 +29,7 @@ setup( name=NAME, version=VERSION, description="{{appName}}", + author="{{infoName}}", author_email="{{infoEmail}}", url="{{packageUrl}}", keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"], @@ -36,6 +37,7 @@ setup( extras_require=EXTRAS, packages=find_packages(exclude=["test", "tests"]), include_package_data=True, + license="{{licenseInfo}}", long_description="""\ {{appDescription}} # noqa: E501 """ diff --git a/samples/client/petstore/python-tornado/setup.py b/samples/client/petstore/python-tornado/setup.py index 6ed0ebf50092..9c782ec337a7 100644 --- a/samples/client/petstore/python-tornado/setup.py +++ b/samples/client/petstore/python-tornado/setup.py @@ -28,12 +28,14 @@ name=NAME, version=VERSION, description="OpenAPI Petstore", + author="", author_email="", url="", keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"], install_requires=REQUIRES, packages=find_packages(exclude=["test", "tests"]), include_package_data=True, + license="Apache-2.0", long_description="""\ This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 """ From 17bc4887ea008f2bc79ee2d5cb628d0533f12c64 Mon Sep 17 00:00:00 2001 From: Sai Giridhar P Date: Thu, 31 Oct 2019 11:10:29 +0530 Subject: [PATCH 3/4] fix(metadata): Adding default values for contact details and license fields --- .../resources/python/python-experimental/setup.mustache | 8 ++++---- .../src/main/resources/python/setup.mustache | 8 ++++---- samples/client/petstore/python-asyncio/setup.py | 4 ++-- samples/client/petstore/python-experimental/setup.py | 4 +++- samples/client/petstore/python-tornado/setup.py | 4 ++-- samples/client/petstore/python/setup.py | 4 ++-- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache index ac60e22afebe..bf9ffe07d08d 100644 --- a/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache +++ b/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache @@ -29,16 +29,16 @@ setup( name=NAME, version=VERSION, description="{{appName}}", - author="{{infoName}}", - author_email="{{infoEmail}}", + author="{{#infoName}}{{infoName}}{{/infoName}}{{^infoName}}OpenAPI Generator community{{/infoName}}", + author_email="{{#infoEmail}}{{infoEmail}}{{/infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}", url="{{packageUrl}}", keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"], install_requires=REQUIRES, extras_require=EXTRAS, packages=find_packages(exclude=["test", "tests"]), include_package_data=True, - license="{{licenseInfo}}", - long_description="""\ + {{#licenseInfo}}license="{{licenseInfo}}", + {{/licenseInfo}}long_description="""\ {{appDescription}} # noqa: E501 """ ) diff --git a/modules/openapi-generator/src/main/resources/python/setup.mustache b/modules/openapi-generator/src/main/resources/python/setup.mustache index 3f314b83468e..a41fee146742 100644 --- a/modules/openapi-generator/src/main/resources/python/setup.mustache +++ b/modules/openapi-generator/src/main/resources/python/setup.mustache @@ -28,15 +28,15 @@ setup( name=NAME, version=VERSION, description="{{appName}}", - author="{{infoName}}", - author_email="{{infoEmail}}", + author="{{#infoName}}{{infoName}}{{/infoName}}{{^infoName}}OpenAPI Generator community{{/infoName}}", + author_email="{{#infoEmail}}{{infoEmail}}{{/infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}", url="{{packageUrl}}", keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"], install_requires=REQUIRES, packages=find_packages(exclude=["test", "tests"]), include_package_data=True, - license="{{licenseInfo}}", - long_description="""\ + {{#licenseInfo}}license="{{licenseInfo}}", + {{/licenseInfo}}long_description="""\ {{appDescription}} # noqa: E501 """ ) diff --git a/samples/client/petstore/python-asyncio/setup.py b/samples/client/petstore/python-asyncio/setup.py index 195700689fe1..beeac0aae7f1 100644 --- a/samples/client/petstore/python-asyncio/setup.py +++ b/samples/client/petstore/python-asyncio/setup.py @@ -28,8 +28,8 @@ name=NAME, version=VERSION, description="OpenAPI Petstore", - author="", - author_email="", + author="OpenAPI Generator community", + author_email="team@openapitools.org", url="", keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"], install_requires=REQUIRES, diff --git a/samples/client/petstore/python-experimental/setup.py b/samples/client/petstore/python-experimental/setup.py index bb88f06e4e4f..f99ea80ad637 100644 --- a/samples/client/petstore/python-experimental/setup.py +++ b/samples/client/petstore/python-experimental/setup.py @@ -28,13 +28,15 @@ name=NAME, version=VERSION, description="OpenAPI Petstore", - author_email="", + author="OpenAPI Generator community", + author_email="team@openapitools.org", url="", keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"], install_requires=REQUIRES, extras_require=EXTRAS, packages=find_packages(exclude=["test", "tests"]), include_package_data=True, + license="Apache-2.0", long_description="""\ This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 """ diff --git a/samples/client/petstore/python-tornado/setup.py b/samples/client/petstore/python-tornado/setup.py index 9c782ec337a7..921be1b7eae5 100644 --- a/samples/client/petstore/python-tornado/setup.py +++ b/samples/client/petstore/python-tornado/setup.py @@ -28,8 +28,8 @@ name=NAME, version=VERSION, description="OpenAPI Petstore", - author="", - author_email="", + author="OpenAPI Generator community", + author_email="team@openapitools.org", url="", keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"], install_requires=REQUIRES, diff --git a/samples/client/petstore/python/setup.py b/samples/client/petstore/python/setup.py index 177f3c51536c..2a3ca48e06ba 100644 --- a/samples/client/petstore/python/setup.py +++ b/samples/client/petstore/python/setup.py @@ -27,8 +27,8 @@ name=NAME, version=VERSION, description="OpenAPI Petstore", - author="", - author_email="", + author="OpenAPI Generator community", + author_email="team@openapitools.org", url="", keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"], install_requires=REQUIRES, From ac2e786c22a7f1253164288f65c7271aff8493a6 Mon Sep 17 00:00:00 2001 From: Sai Giridhar P Date: Fri, 1 Nov 2019 06:25:20 +0530 Subject: [PATCH 4/4] fix(metadata): Adding default values for contact details and license fields --- samples/openapi3/client/petstore/python/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/openapi3/client/petstore/python/setup.py b/samples/openapi3/client/petstore/python/setup.py index 177f3c51536c..2a3ca48e06ba 100644 --- a/samples/openapi3/client/petstore/python/setup.py +++ b/samples/openapi3/client/petstore/python/setup.py @@ -27,8 +27,8 @@ name=NAME, version=VERSION, description="OpenAPI Petstore", - author="", - author_email="", + author="OpenAPI Generator community", + author_email="team@openapitools.org", url="", keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"], install_requires=REQUIRES,