Add support for Python 3.6 (fixes #154 & #137). Also add support for IntEnum properties.

Author: dbanty

.circleci/config.yml

@@ -78,4 +78,4 @@ workflows:
       - test:
           matrix:
             parameters:
-              python-version: ["3.7", "3.8"]
+              python-version: ["3.6", "3.7", "3.8"]

CHANGELOG.md

@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   the `sync()` and `asyncio()` functions for a path operation will return `None`. This means all return types are now
   `Optional`, so mypy will require you to handle potential errors (or explicitly ignore them).
 - Moved `models.types` generated module up a level, so just `types`.
-- `Client` and `AuthenticatedClient` are now declared using the `attrs` package instead of builtin `dataclass`
+- All generated classes that were `dataclass` now use the `attrs` package instead
 
 ### Additions
 
@@ -33,6 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Unsupported content types or no responses at all will no longer result in an endpoint being completely skipped. Instead, 
   only the `detailed` versions of the endpoint will be generated, where the resulting `Response.parsed` is always `None`.
   (#141)
+- Support for Python 3.6 (#137 & #154)
+- Support for enums with integer values
 
 ### Changes
 

end_to_end_tests/fastapi_app/__init__.py

@@ -1,7 +1,7 @@
 """ A FastAPI app used to create an OpenAPI document for end-to-end testing """
 import json
 from datetime import date, datetime
-from enum import Enum
+from enum import Enum, IntEnum
 from pathlib import Path
 from typing import Dict, List, Union
 
@@ -136,6 +136,16 @@ def unsupported_content():
     pass
 
 
+class AnIntEnum(IntEnum):
+    FIRST = 1
+    SECOND = 2
+
+
+@test_router.post("/int_enum")
+def int_enum(int_enum: AnIntEnum):
+    pass
+
+
 app.include_router(test_router, prefix="/tests", tags=["tests"])
 
 

end_to_end_tests/fastapi_app/openapi.json

@@ -51,16 +51,8 @@
                         "required": true,
                         "schema": {
                             "title": "Some Date",
-                            "anyOf": [
-                                {
-                                    "type": "string",
-                                    "format": "date"
-                                },
-                                {
-                                    "type": "string",
-                                    "format": "date-time"
-                                }
-                            ]
+                            "type": "string",
+                            "format": "date"
                         },
                         "name": "some_date",
                         "in": "query"
@@ -504,6 +496,45 @@
                     }
                 }
             }
+        },
+        "/tests/int_enum": {
+            "post": {
+                "tags": [
+                    "tests"
+                ],
+                "summary": "Int Enum",
+                "operationId": "int_enum_tests_int_enum_post",
+                "parameters": [
+                    {
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/components/schemas/AnIntEnum"
+                        },
+                        "name": "int_enum",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successful Response",
+                        "content": {
+                            "application/json": {
+                                "schema": {}
+                            }
+                        }
+                    },
+                    "422": {
+                        "description": "Validation Error",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/HTTPValidationError"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
     },
     "components": {
@@ -542,16 +573,8 @@
                     },
                     "aCamelDateTime": {
                         "title": "Acameldatetime",
-                        "anyOf": [
-                            {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            {
-                                "type": "string",
-                                "format": "date"
-                            }
-                        ]
+                        "type": "string",
+                        "format": "date"
                     },
                     "a_date": {
                         "title": "A Date",
@@ -569,6 +592,15 @@
                 ],
                 "description": "For testing Enums in all the ways they can be used "
             },
+            "AnIntEnum": {
+                "title": "AnIntEnum",
+                "enum": [
+                    1,
+                    2
+                ],
+                "type": "integer",
+                "description": "An enumeration."
+            },
             "Body_upload_file_tests_upload_post": {
                 "title": "Body_upload_file_tests_upload_post",
                 "required": [

end_to_end_tests/golden-record/my_test_api_client/api/default/ping_ping_get.py

@@ -1,7 +1,7 @@
-from dataclasses import asdict
 from typing import Any, Dict, List, Optional, Union, cast
 
 import httpx
+from attr import asdict
 
 from ...client import AuthenticatedClient, Client
 from ...types import Response

end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py

@@ -1,8 +1,9 @@
 import datetime
-from dataclasses import asdict
 from typing import Any, Dict, List, Optional, Union, cast
 
 import httpx
+from attr import asdict
+from dateutil.parser import isoparse
 
 from ...client import AuthenticatedClient, Client
 from ...models.an_enum import AnEnum
@@ -15,8 +16,8 @@ def _get_kwargs(
     client: Client,
     json_body: Dict[Any, Any],
     string_prop: Optional[str] = "the default string",
-    datetime_prop: Optional[datetime.datetime] = datetime.datetime(1010, 10, 10, 0, 0),
-    date_prop: Optional[datetime.date] = datetime.date(1010, 10, 10),
+    datetime_prop: Optional[datetime.datetime] = isoparse("1010-10-10T00:00:00"),
+    date_prop: Optional[datetime.date] = isoparse("1010-10-10").date(),
     float_prop: Optional[float] = 3.14,
     int_prop: Optional[int] = 7,
     boolean_prop: Optional[bool] = False,
@@ -104,8 +105,8 @@ def sync_detailed(
     client: Client,
     json_body: Dict[Any, Any],
     string_prop: Optional[str] = "the default string",
-    datetime_prop: Optional[datetime.datetime] = datetime.datetime(1010, 10, 10, 0, 0),
-    date_prop: Optional[datetime.date] = datetime.date(1010, 10, 10),
+    datetime_prop: Optional[datetime.datetime] = isoparse("1010-10-10T00:00:00"),
+    date_prop: Optional[datetime.date] = isoparse("1010-10-10").date(),
     float_prop: Optional[float] = 3.14,
     int_prop: Optional[int] = 7,
     boolean_prop: Optional[bool] = False,
@@ -139,8 +140,8 @@ def sync(
     client: Client,
     json_body: Dict[Any, Any],
     string_prop: Optional[str] = "the default string",
-    datetime_prop: Optional[datetime.datetime] = datetime.datetime(1010, 10, 10, 0, 0),
-    date_prop: Optional[datetime.date] = datetime.date(1010, 10, 10),
+    datetime_prop: Optional[datetime.datetime] = isoparse("1010-10-10T00:00:00"),
+    date_prop: Optional[datetime.date] = isoparse("1010-10-10").date(),
     float_prop: Optional[float] = 3.14,
     int_prop: Optional[int] = 7,
     boolean_prop: Optional[bool] = False,
@@ -170,8 +171,8 @@ async def asyncio_detailed(
     client: Client,
     json_body: Dict[Any, Any],
     string_prop: Optional[str] = "the default string",
-    datetime_prop: Optional[datetime.datetime] = datetime.datetime(1010, 10, 10, 0, 0),
-    date_prop: Optional[datetime.date] = datetime.date(1010, 10, 10),
+    datetime_prop: Optional[datetime.datetime] = isoparse("1010-10-10T00:00:00"),
+    date_prop: Optional[datetime.date] = isoparse("1010-10-10").date(),
     float_prop: Optional[float] = 3.14,
     int_prop: Optional[int] = 7,
     boolean_prop: Optional[bool] = False,
@@ -204,8 +205,8 @@ async def asyncio(
     client: Client,
     json_body: Dict[Any, Any],
     string_prop: Optional[str] = "the default string",
-    datetime_prop: Optional[datetime.datetime] = datetime.datetime(1010, 10, 10, 0, 0),
-    date_prop: Optional[datetime.date] = datetime.date(1010, 10, 10),
+    datetime_prop: Optional[datetime.datetime] = isoparse("1010-10-10T00:00:00"),
+    date_prop: Optional[datetime.date] = isoparse("1010-10-10").date(),
     float_prop: Optional[float] = 3.14,
     int_prop: Optional[int] = 7,
     boolean_prop: Optional[bool] = False,

end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py

@@ -1,7 +1,7 @@
-from dataclasses import asdict
 from typing import Any, Dict, List, Optional, Union, cast
 
 import httpx
+from attr import asdict
 
 from ...client import AuthenticatedClient, Client
 from ...types import Response

end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py

@@ -1,7 +1,7 @@
-from dataclasses import asdict
 from typing import Any, Dict, List, Optional, Union, cast
 
 import httpx
+from attr import asdict
 
 from ...client import AuthenticatedClient, Client
 from ...types import Response

end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py

@@ -1,7 +1,7 @@
-from dataclasses import asdict
 from typing import Any, Dict, List, Optional, Union, cast
 
 import httpx
+from attr import asdict
 
 from ...client import AuthenticatedClient, Client
 from ...types import Response

end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py

@@ -1,7 +1,7 @@
-from dataclasses import asdict
 from typing import Any, Dict, List, Optional, Union, cast
 
 import httpx
+from attr import asdict
 
 from ...client import AuthenticatedClient, Client
 from ...types import Response

end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py

@@ -1,8 +1,9 @@
 import datetime
-from dataclasses import asdict
 from typing import Any, Dict, List, Optional, Union, cast
 
 import httpx
+from attr import asdict
+from dateutil.parser import isoparse
 
 from ...client import AuthenticatedClient, Client
 from ...models.a_model import AModel
@@ -15,7 +16,7 @@ def _get_kwargs(
     *,
     client: Client,
     an_enum_value: List[AnEnum],
-    some_date: Union[datetime.date, datetime.datetime],
+    some_date: datetime.date,
 ) -> Dict[str, Any]:
     url = "{}/tests/".format(client.base_url)
 
@@ -27,11 +28,7 @@ def _get_kwargs(
 
         json_an_enum_value.append(an_enum_value_item)
 
-    if isinstance(some_date, datetime.date):
-        json_some_date = some_date.isoformat()
-
-    else:
-        json_some_date = some_date.isoformat()
+    json_some_date = some_date.isoformat()
 
     params: Dict[str, Any] = {
         "an_enum_value": json_an_enum_value,
@@ -68,7 +65,7 @@ def sync_detailed(
     *,
     client: Client,
     an_enum_value: List[AnEnum],
-    some_date: Union[datetime.date, datetime.datetime],
+    some_date: datetime.date,
 ) -> Response[Union[List[AModel], HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -87,7 +84,7 @@ def sync(
     *,
     client: Client,
     an_enum_value: List[AnEnum],
-    some_date: Union[datetime.date, datetime.datetime],
+    some_date: datetime.date,
 ) -> Optional[Union[List[AModel], HTTPValidationError]]:
     """ Get a list of things  """
 
@@ -102,7 +99,7 @@ async def asyncio_detailed(
     *,
     client: Client,
     an_enum_value: List[AnEnum],
-    some_date: Union[datetime.date, datetime.datetime],
+    some_date: datetime.date,
 ) -> Response[Union[List[AModel], HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
@@ -120,7 +117,7 @@ async def asyncio(
     *,
     client: Client,
     an_enum_value: List[AnEnum],
-    some_date: Union[datetime.date, datetime.datetime],
+    some_date: datetime.date,
 ) -> Optional[Union[List[AModel], HTTPValidationError]]:
     """ Get a list of things  """