[python] Update python versions (#8042)

* Remove redundant encoding definitions

UTF-8 is already the default encoding in Python 3.

* Remove Python3.4 related requirements

* Remove dead Python version 3.5

* Add Python 3.9 to CI and test configs

* Update petstore example

modules/openapi-generator/src/main/resources/python/README.mustache

@@ -17,7 +17,7 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 
 ## Requirements.
 
-Python >= 3.5
+Python >= 3.6
 
 ## Installation & Usage
 ### pip install

modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache

@@ -17,7 +17,7 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 
 ## Requirements.
 
-Python >= 3.5
+Python >= 3.6
 
 ## Installation & Usage
 

modules/openapi-generator/src/main/resources/python/__init__apis.mustache

@@ -1,7 +1,6 @@
 {{#apiInfo}}
 {{#apis}}
 {{#-first}}
-# coding: utf-8
 
 # flake8: noqa
 

modules/openapi-generator/src/main/resources/python/__init__models.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 # flake8: noqa
 
 # import all models into this package

modules/openapi-generator/src/main/resources/python/__init__package.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 # flake8: noqa
 
 {{>partial_header}}

modules/openapi-generator/src/main/resources/python/api.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 import re  # noqa: F401

modules/openapi-generator/src/main/resources/python/api_client.mustache

@@ -1,4 +1,3 @@
-# coding: utf-8
 {{>partial_header}}
 
 import json

modules/openapi-generator/src/main/resources/python/api_test.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 import unittest

modules/openapi-generator/src/main/resources/python/asyncio/rest.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 import io

modules/openapi-generator/src/main/resources/python/configuration.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 import copy

modules/openapi-generator/src/main/resources/python/exceptions.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 

modules/openapi-generator/src/main/resources/python/gitlab-ci.mustache

@@ -15,9 +15,6 @@ stages:
    - pytest --cov={{{packageName}}}
    {{/useNose}}
 
-test-3.5:
-  extends: .tests
-  image: python:3.5-alpine
 test-3.6:
   extends: .tests
   image: python:3.6-alpine
@@ -27,3 +24,6 @@ test-3.7:
 test-3.8:
   extends: .tests
   image: python:3.8-alpine
+test-3.9:
+  extends: .tests
+  image: python:3.9-alpine

modules/openapi-generator/src/main/resources/python/model.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{> partial_header }}
 
 import re  # noqa: F401

modules/openapi-generator/src/main/resources/python/model_test.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 import sys

modules/openapi-generator/src/main/resources/python/model_utils.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 from datetime import date, datetime  # noqa: F401

modules/openapi-generator/src/main/resources/python/rest.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 import io

modules/openapi-generator/src/main/resources/python/setup.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 from setuptools import setup, find_packages  # noqa: H301
@@ -41,7 +39,7 @@ setup(
     author_email="{{#infoEmail}}{{infoEmail}}{{/infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}",
     url="{{packageUrl}}",
     keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"],
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     install_requires=REQUIRES,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,

modules/openapi-generator/src/main/resources/python/signing.mustache

@@ -1,4 +1,3 @@
-# coding: utf-8
 {{>partial_header}}
 
 from base64 import b64encode

modules/openapi-generator/src/main/resources/python/test-requirements.mustache

@@ -6,10 +6,8 @@ py>=1.4.31
 randomize>=0.13
 {{/useNose}}
 {{^useNose}}
-pytest~=4.6.7 # needed for python 3.4
 pytest-cov>=2.8.1
-pytest-randomly==1.2.3 # needed for python 3.4
 {{/useNose}}
 {{#hasHttpSignatureMethods}}
 pycryptodome>=3.9.0
-{{/hasHttpSignatureMethods}}
+{{/hasHttpSignatureMethods}}

modules/openapi-generator/src/main/resources/python/tornado/rest.mustache

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 {{>partial_header}}
 
 import io

modules/openapi-generator/src/main/resources/python/travis.mustache

@@ -1,10 +1,10 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"
+  - "3.9"
 # command to install dependencies
 install:
   - "pip install -r requirements.txt"

samples/client/petstore/python/.gitlab-ci.yml

@@ -10,9 +10,6 @@ stages:
    - pip install -r test-requirements.txt
    - pytest --cov=petstore_api
 
-test-3.5:
-  extends: .tests
-  image: python:3.5-alpine
 test-3.6:
   extends: .tests
   image: python:3.6-alpine
@@ -22,3 +19,6 @@ test-3.7:
 test-3.8:
   extends: .tests
   image: python:3.8-alpine
+test-3.9:
+  extends: .tests
+  image: python:3.9-alpine

samples/client/petstore/python/.travis.yml

@@ -1,10 +1,10 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"
+  - "3.9"
 # command to install dependencies
 install:
   - "pip install -r requirements.txt"

samples/client/petstore/python/README.md

@@ -9,7 +9,7 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 ## Requirements.
 
-Python >= 3.5
+Python >= 3.6
 
 ## Installation & Usage
 ### pip install

samples/client/petstore/python/petstore_api/__init__.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 # flake8: noqa
 
 """

samples/client/petstore/python/petstore_api/api/another_fake_api.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/api/fake_api.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/api/pet_api.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/api/store_api.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/api/user_api.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/api_client.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/apis/__init__.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 
 # flake8: noqa
 

samples/client/petstore/python/petstore_api/configuration.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/exceptions.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/additional_properties_any_type.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/additional_properties_array.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/additional_properties_boolean.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/additional_properties_class.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/additional_properties_integer.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/additional_properties_number.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/additional_properties_object.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/additional_properties_string.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/animal.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/animal_farm.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/api_response.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/array_of_array_of_number_only.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/array_of_number_only.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/array_test.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/capitalization.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/cat.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/cat_all_of.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/category.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/child.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/child_all_of.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/child_cat.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/child_cat_all_of.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/child_dog.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/child_dog_all_of.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/child_lizard.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/child_lizard_all_of.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/class_model.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/client.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/dog.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/dog_all_of.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/enum_arrays.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/enum_class.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/enum_test.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/file.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/file_schema_test_class.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/format_test.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/grandparent.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/grandparent_animal.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/has_only_read_only.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/list.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/map_test.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/mixed_properties_and_additional_properties_class.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/model200_response.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/model_return.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/name.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/number_only.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/number_with_validations.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/object_model_with_ref_props.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/order.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/parent.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/parent_all_of.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/parent_pet.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/pet.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/player.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/read_only_first.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/special_model_name.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/string_boolean_map.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/string_enum.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/tag.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/type_holder_default.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/type_holder_example.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/user.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model/xml_item.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/model_utils.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     OpenAPI Petstore
 

samples/client/petstore/python/petstore_api/models/__init__.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 # flake8: noqa
 
 # import all models into this package