Added autoflake to generation and cleaned up a couple of flake8 issues. Closes #138

dbanty · dbanty · commit e8efab60d471 · 2020-09-26T11:16:39.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Additions
 
 - Endpoints without operationIds will have a name generated from their method and path (#92). Thanks @Kerybas & @dtkav!
+- autoflake will be run on generated clients to clean up unused imports / variables (#138). Thanks @pawamoy!
 - Note to README about supported OpenAPI versions (#176). Thanks @filippog!
 
 ## 0.6.0 - 2020-09-21
diff --git a/end_to_end_tests/golden-record/my_test_api_client/__init__.py b/end_to_end_tests/golden-record/my_test_api_client/__init__.py
@@ -1,2 +1 @@
 """ A client library for accessing My Test API """
-from .client import AuthenticatedClient, Client
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/default/ping_ping_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/default/ping_ping_get.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, Optional
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...types import Response
 
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py
@@ -2,10 +2,9 @@
 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 ...client import Client
 from ...models.an_enum import AnEnum
 from ...models.http_validation_error import HTTPValidationError
 from ...types import Response
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Optional, cast
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...types import Response
 
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Optional, cast
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...types import Response
 
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Optional, cast
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...types import Response
 
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Optional, cast
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...types import Response
 
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py
@@ -2,10 +2,8 @@
 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 ...client import Client
 from ...models.a_model import AModel
 from ...models.an_enum import AnEnum
 from ...models.http_validation_error import HTTPValidationError
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, Optional, Union, cast
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...models.an_int_enum import AnIntEnum
 from ...models.http_validation_error import HTTPValidationError
 from ...types import Response
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, Optional, Union, cast
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...models.a_model import AModel
 from ...models.http_validation_error import HTTPValidationError
 from ...types import Response
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...types import Response
 
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, Optional
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...types import Response
 
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...types import Response
 
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, Optional, Union, cast
 
 import httpx
-from attr import asdict
 
-from ...client import AuthenticatedClient, Client
+from ...client import Client
 from ...models.body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from ...models.http_validation_error import HTTPValidationError
 from ...types import Response
diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py b/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py
@@ -1,9 +1 @@
 """ Contains all the data models used in inputs/outputs """
-
-from .a_model import AModel
-from .an_enum import AnEnum
-from .an_int_enum import AnIntEnum
-from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
-from .different_enum import DifferentEnum
-from .http_validation_error import HTTPValidationError
-from .validation_error import ValidationError
diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/a_model.py b/end_to_end_tests/golden-record/my_test_api_client/models/a_model.py
@@ -1,5 +1,5 @@
 import datetime
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Optional, Union
 
 import attr
 from dateutil.parser import isoparse
@@ -64,7 +64,7 @@ def _parse_a_camel_date_time(data: Dict[str, Any]) -> Union[datetime.datetime, d
                 a_camel_date_time = isoparse(d["aCamelDateTime"])
 
                 return a_camel_date_time
-            except:
+            except:  # noqa: E722
                 pass
             a_camel_date_time = isoparse(d["aCamelDateTime"]).date()
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/http_validation_error.py b/end_to_end_tests/golden-record/my_test_api_client/models/http_validation_error.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, cast
+from typing import Any, Dict, List, Optional
 
 import attr
 
diff --git a/openapi_python_client/__init__.py b/openapi_python_client/__init__.py
@@ -75,6 +75,13 @@ def update(self) -> Sequence[GeneratorError]:
         return self._get_errors()
 
     def _reformat(self) -> None:
+        subprocess.run(
+            "autoflake -i -r --remove-all-unused-imports --remove-unused-variables .",
+            cwd=self.package_dir,
+            shell=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
         subprocess.run(
             "isort .",
             cwd=self.project_dir,
diff --git a/openapi_python_client/templates/property_templates/union_property.pyi b/openapi_python_client/templates/property_templates/union_property.pyi
@@ -7,7 +7,7 @@ def _parse_{{ property.python_name }}(data: Dict[str, Any]) -> {{ property.get_t
     {% from "property_templates/" + inner_property.template import construct %}
         {{ construct(inner_property, source) | indent(8) }}
         return {{ property.python_name }}
-    except:
+    except: # noqa: E722
         pass
     {% elif inner_property.template and loop.last %}{# Don't do try/except for the last one #}
     {% from "property_templates/" + inner_property.template import construct %}
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,6 +33,7 @@ pydantic = "^1.6.1"
 attrs = "^20.1.0"
 python-dateutil = "^2.8.1"
 httpx = "^0.15.4"
+autoflake = "^1.4"
 
 [tool.poetry.scripts]
 openapi-python-client = "openapi_python_client.cli:app"
diff --git a/tests/test___init__.py b/tests/test___init__.py
@@ -381,6 +381,13 @@ def test__reformat(mocker):
 
     sub_run.assert_has_calls(
         [
+            mocker.call(
+                "autoflake -i -r --remove-all-unused-imports --remove-unused-variables .",
+                cwd=project.package_dir,
+                shell=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+            ),
             mocker.call(
                 "isort .",
                 cwd=project.project_dir,

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`""" A client library for accessing My Test API """`
`2`		`-from .client import AuthenticatedClient, Client`