python: test with more modern versions (#19452)

Python 3.12 has been released in October 2023, it should be tested in the CI. Python 3.7 is not maintained anymore, removing it from the minimum required version in `pyproject.toml` files.
OpenAPITools · Sep 18, 2024 · 40967a3 · 40967a3
1 parent b3e72fe
commit 40967a3
Show file tree

Hide file tree

Showing 228 changed files with 2,359 additions and 2,287 deletions.
diff --git a/.github/workflows/samples-postman.yaml b/.github/workflows/samples-postman.yaml
@@ -17,7 +17,7 @@ jobs:
           # schema
           - samples/schema/postman-collection
         python-version:
-          - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

diff --git a/.github/workflows/samples-python-petstore.yaml b/.github/workflows/samples-python-petstore.yaml
@@ -19,6 +19,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         sample:
           - samples/openapi3/client/petstore/python-aiohttp
           - samples/openapi3/client/petstore/python

diff --git a/.github/workflows/samples-python-pydantic-v1-client-echo-api.yaml b/.github/workflows/samples-python-pydantic-v1-client-echo-api.yaml
@@ -17,11 +17,11 @@ jobs:
           # clients
           - samples/client/echo_api/python-pydantic-v1/
         python-version:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

diff --git a/.github/workflows/samples-python-pydantic-v1-petstore.yaml b/.github/workflows/samples-python-pydantic-v1-petstore.yaml
@@ -19,6 +19,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         sample:
           - samples/openapi3/client/petstore/python-pydantic-v1-aiohttp
           - samples/openapi3/client/petstore/python-pydantic-v1

diff --git a/.github/workflows/samples-python-server.yaml b/.github/workflows/samples-python-server.yaml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.9'
       - name: Test
         working-directory: ${{ matrix.sample }}
         run: make test-all
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_test.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_test.mustache
@@ -7,17 +7,31 @@ import unittest
 from {{apiPackage}}.{{classFilename}} import {{classname}}  # noqa: E501
 
 
-class {{#operations}}Test{{classname}}(unittest.TestCase):
+class {{#operations}}Test{{classname}}(unittest.{{#asyncio}}IsolatedAsyncio{{/asyncio}}TestCase):
     """{{classname}} unit test stubs"""
 
+    {{#asyncio}}
+    async def asyncSetUp(self) -> None:
+        self.api = {{classname}}()
+
+    async def asyncTearDown(self) -> None:
+        pass
+    {{/asyncio}}
+    {{^asyncio}}
     def setUp(self) -> None:
-        self.api = {{classname}}()  # noqa: E501
+        self.api = {{classname}}()
 
     def tearDown(self) -> None:
         pass
+    {{/asyncio}}
 
-   {{#operation}}
+    {{#operation}}
+    {{#asyncio}}
+    async def test_{{operationId}}(self) -> None:
+    {{/asyncio}}
+    {{^asyncio}}
     def test_{{operationId}}(self) -> None:
+    {{/asyncio}}
         """Test case for {{{operationId}}}
 
 {{#summary}}

diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/github-workflow.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/github-workflow.mustache
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/pyproject.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/pyproject.mustache
@@ -10,7 +10,7 @@ keywords = ["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"]
 include = ["{{packageName}}/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 
 urllib3 = ">= 1.25.3"
 python-dateutil = ">=2.8.2"

diff --git a/modules/openapi-generator/src/main/resources/python/api_test.mustache b/modules/openapi-generator/src/main/resources/python/api_test.mustache
@@ -7,17 +7,31 @@ import unittest
 from {{apiPackage}}.{{classFilename}} import {{classname}}
 
 
-class {{#operations}}Test{{classname}}(unittest.TestCase):
+class {{#operations}}Test{{classname}}(unittest.{{#asyncio}}IsolatedAsyncio{{/asyncio}}TestCase):
     """{{classname}} unit test stubs"""
 
+    {{#asyncio}}
+    async def asyncSetUp(self) -> None:
+        self.api = {{classname}}()
+
+    async def asyncTearDown(self) -> None:
+        pass
+    {{/asyncio}}
+    {{^asyncio}}
     def setUp(self) -> None:
         self.api = {{classname}}()
 
     def tearDown(self) -> None:
         pass
+    {{/asyncio}}
 
-   {{#operation}}
+    {{#operation}}
+    {{#asyncio}}
+    async def test_{{operationId}}(self) -> None:
+    {{/asyncio}}
+    {{^asyncio}}
     def test_{{operationId}}(self) -> None:
+    {{/asyncio}}
         """Test case for {{{operationId}}}
 
 {{#summary}}

diff --git a/modules/openapi-generator/src/main/resources/python/github-workflow.mustache b/modules/openapi-generator/src/main/resources/python/github-workflow.mustache
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/modules/openapi-generator/src/main/resources/python/pyproject.mustache b/modules/openapi-generator/src/main/resources/python/pyproject.mustache
@@ -10,7 +10,7 @@ keywords = ["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"]
 include = ["{{packageName}}/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 
 urllib3 = ">= 1.25.3"
 python-dateutil = ">=2.8.2"
@@ -33,7 +33,7 @@ pytest = ">=7.2.1"
 tox = ">=3.9.0"
 flake8 = ">=4.0.0"
 types-python-dateutil = ">=2.8.19.14"
-mypy = "1.4.1"
+mypy = ">=1.5"
 
 
 [build-system]

diff --git a/...ent/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.github/workflows/python.yml b/...ent/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.github/workflows/python.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/pyproject.toml b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/pyproject.toml
@@ -10,7 +10,7 @@ keywords = ["OpenAPI", "OpenAPI-Generator", "Echo Server API"]
 include = ["openapi_client/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 
 urllib3 = ">= 1.25.3"
 python-dateutil = ">=2.8.2"
@@ -22,7 +22,7 @@ pytest = ">=7.2.1"
 tox = ">=3.9.0"
 flake8 = ">=4.0.0"
 types-python-dateutil = ">=2.8.19.14"
-mypy = "1.4.1"
+mypy = ">=1.5"
 
 
 [build-system]

diff --git a/samples/client/echo_api/python-pydantic-v1/.github/workflows/python.yml b/samples/client/echo_api/python-pydantic-v1/.github/workflows/python.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/samples/client/echo_api/python-pydantic-v1/pyproject.toml b/samples/client/echo_api/python-pydantic-v1/pyproject.toml
@@ -10,7 +10,7 @@ keywords = ["OpenAPI", "OpenAPI-Generator", "Echo Server API"]
 include = ["openapi_client/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 
 urllib3 = ">= 1.25.3"
 python-dateutil = ">=2.8.2"

diff --git a/samples/client/echo_api/python/.github/workflows/python.yml b/samples/client/echo_api/python/.github/workflows/python.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/samples/client/echo_api/python/pyproject.toml b/samples/client/echo_api/python/pyproject.toml
@@ -10,7 +10,7 @@ keywords = ["OpenAPI", "OpenAPI-Generator", "Echo Server API"]
 include = ["openapi_client/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 
 urllib3 = ">= 1.25.3"
 python-dateutil = ">=2.8.2"
@@ -22,7 +22,7 @@ pytest = ">=7.2.1"
 tox = ">=3.9.0"
 flake8 = ">=4.0.0"
 types-python-dateutil = ">=2.8.19.14"
-mypy = "1.4.1"
+mypy = ">=1.5"
 
 
 [build-system]

diff --git a/samples/openapi3/client/petstore/python-aiohttp/.github/workflows/python.yml b/samples/openapi3/client/petstore/python-aiohttp/.github/workflows/python.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/samples/openapi3/client/petstore/python-aiohttp/pyproject.toml b/samples/openapi3/client/petstore/python-aiohttp/pyproject.toml
@@ -10,7 +10,7 @@ keywords = ["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"]
 include = ["petstore_api/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 
 urllib3 = ">= 1.25.3"
 python-dateutil = ">=2.8.2"
@@ -26,7 +26,7 @@ pytest = ">=7.2.1"
 tox = ">=3.9.0"
 flake8 = ">=4.0.0"
 types-python-dateutil = ">=2.8.19.14"
-mypy = "1.4.1"
+mypy = ">=1.5"
 
 
 [build-system]

diff --git a/samples/openapi3/client/petstore/python-aiohttp/test/test_additional_properties_any_type.py b/samples/openapi3/client/petstore/python-aiohttp/test/test_additional_properties_any_type.py
@@ -3,21 +3,18 @@
 """
     OpenAPI Petstore
 
-    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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
 
 import unittest
-import datetime
 
-import petstore_api
-from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType  # noqa: E501
-from petstore_api.rest import ApiException
+from petstore_api.models.additional_properties_any_type import AdditionalPropertiesAnyType
 
 class TestAdditionalPropertiesAnyType(unittest.TestCase):
     """AdditionalPropertiesAnyType unit test stubs"""
@@ -28,19 +25,19 @@ def setUp(self):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional):
+    def make_instance(self, include_optional) -> AdditionalPropertiesAnyType:
         """Test AdditionalPropertiesAnyType
-            include_option is a boolean, when False only required
+            include_optional is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `AdditionalPropertiesAnyType`
         """
-        model = petstore_api.models.additional_properties_any_type.AdditionalPropertiesAnyType()  # noqa: E501
-        if include_optional :
+        model = AdditionalPropertiesAnyType()
+        if include_optional:
             return AdditionalPropertiesAnyType(
                 name = ''
             )
-        else :
+        else:
             return AdditionalPropertiesAnyType(
         )
         """

diff --git a/samples/openapi3/client/petstore/python-aiohttp/test/test_additional_properties_class.py b/samples/openapi3/client/petstore/python-aiohttp/test/test_additional_properties_class.py
@@ -3,21 +3,18 @@
 """
     OpenAPI Petstore
 
-    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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
     The version of the OpenAPI document: 1.0.0
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
 
 import unittest
-import datetime
 
-import petstore_api
-from petstore_api.models.additional_properties_class import AdditionalPropertiesClass  # noqa: E501
-from petstore_api.rest import ApiException
+from petstore_api.models.additional_properties_class import AdditionalPropertiesClass
 
 class TestAdditionalPropertiesClass(unittest.TestCase):
     """AdditionalPropertiesClass unit test stubs"""
@@ -28,26 +25,26 @@ def setUp(self):
     def tearDown(self):
         pass
 
-    def make_instance(self, include_optional):
+    def make_instance(self, include_optional) -> AdditionalPropertiesClass:
         """Test AdditionalPropertiesClass
-            include_option is a boolean, when False only required
+            include_optional is a boolean, when False only required
             params are included, when True both required and
             optional params are included """
         # uncomment below to create an instance of `AdditionalPropertiesClass`
         """
-        model = petstore_api.models.additional_properties_class.AdditionalPropertiesClass()  # noqa: E501
-        if include_optional :
+        model = AdditionalPropertiesClass()
+        if include_optional:
             return AdditionalPropertiesClass(
                 map_property = {
                     'key' : ''
-                    }, 
+                    },
                 map_of_map_property = {
                     'key' : {
                         'key' : ''
                         }
                     }
             )
-        else :
+        else:
             return AdditionalPropertiesClass(
         )
         """