ci: Update and consolidate QC/CI tools

.github/workflows/checks.yml

@@ -49,9 +49,6 @@ jobs:
       - name: Run isort
         run: poetry run isort . --check
 
-      - name: Run flake8
-        run: poetry run flake8 openapi_python_client
-
       - name: Run safety
         run: poetry export -f requirements.txt | poetry run safety check --bare --stdin
 

openapi_python_client/__init__.py

@@ -377,12 +377,12 @@ def _load_yaml_or_json(data: bytes, content_type: Optional[str]) -> Union[Dict[s
         try:
             return json.loads(data.decode())
         except ValueError as err:
-            return GeneratorError(header="Invalid JSON from provided source: {}".format(str(err)))
+            return GeneratorError(header=f"Invalid JSON from provided source: {err}")
     else:
         try:
             return yaml.safe_load(data)
         except yaml.YAMLError as err:
-            return GeneratorError(header="Invalid YAML from provided source: {}".format(str(err)))
+            return GeneratorError(header=f"Invalid YAML from provided source: {err}")
 
 
 def _get_document(*, url: Optional[str], path: Optional[Path]) -> Union[Dict[str, Any], GeneratorError]:

openapi_python_client/cli.py

@@ -135,7 +135,7 @@ def generate(
     try:
         codecs.getencoder(file_encoding)
     except LookupError as err:
-        typer.secho("Unknown encoding : {}".format(file_encoding), fg=typer.colors.RED)
+        typer.secho(f"Unknown encoding : {file_encoding}", fg=typer.colors.RED)
         raise typer.Exit(code=1) from err
 
     config = _process_config(config_path)
@@ -178,7 +178,7 @@ def update(
     try:
         codecs.getencoder(file_encoding)
     except LookupError as err:
-        typer.secho("Unknown encoding : {}".format(file_encoding), fg=typer.colors.RED)
+        typer.secho(f"Unknown encoding : {file_encoding}", fg=typer.colors.RED)
         raise typer.Exit(code=1) from err
 
     config = _process_config(config_path)

pyproject.toml

@@ -46,7 +46,6 @@ taskipy = "*"
 safety = "*"
 pytest-cov = "*"
 python-multipart = "*"
-flake8 = "*"
 types-PyYAML = "^6.0.3"
 types-certifi = "^2020.0.0"
 types-python-dateutil = "^2.0.0"
@@ -56,7 +55,6 @@ pylint = "^2.9.6"
 check = """
 isort .\
  && black .\
- && flake8 openapi_python_client\
  && poetry export -f requirements.txt | poetry run safety check --bare --stdin\
  && mypy openapi_python_client\
  && pylint openapi_python_client\
@@ -124,6 +122,23 @@ disable = [
     "cyclic-import",
 ]
 
+[tool.mypy]
+plugins = ["pydantic.mypy"]
+disallow_any_generics = true
+disallow_untyped_defs = true
+warn_redundant_casts = true
+strict_equality = true
+
+[[tool.mypy.overrides]]
+module = [
+    "importlib_metadata",
+    "typer",
+]
+ignore_missing_imports = true
+
+[tool.pytest.ini_options]
+junit_family = "xunit2"
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"