Skip to content

Commit 28f0ae8

Browse files
committed
feat: streamline import statements and enhance code readability
1 parent a4b87d6 commit 28f0ae8

File tree

16 files changed

+130
-246
lines changed

16 files changed

+130
-246
lines changed

.flake8

Lines changed: 0 additions & 8 deletions
This file was deleted.

noxfile.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99

1010
import nox
1111

12-
1312
try:
14-
from nox_poetry import Session
15-
from nox_poetry import session
13+
from nox_poetry import Session, session
1614
except ImportError:
1715
message = f"""\
1816
Nox failed to import the 'nox-poetry' package.

poetry.lock

Lines changed: 30 additions & 156 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ pyyaml = "^6.0.2"
3232
Pygments = ">=2.10.0"
3333
coverage = {extras = ["toml"], version = "^6.4.1"}
3434
darglint = ">=1.8.1"
35-
flake8 = ">=3.0.1"
36-
flake8-bandit = ">=2.1.2"
37-
flake8-bugbear = ">=21.9.2"
38-
flake8-docstrings = ">=1.6.0"
39-
flake8-rst-docstrings = ">=0.2.5"
35+
ruff = ">=0.12.12"
4036
furo = ">=2021.11.12"
4137
mypy = ">=0.930"
4238
pep8-naming = ">=0.10.1"
@@ -86,3 +82,23 @@ show_error_context = true
8682
[build-system]
8783
requires = ["poetry-core>=1.0.0"]
8884
build-backend = "poetry.core.masonry.api"
85+
86+
[tool.ruff]
87+
exclude = ["tests/*"]
88+
line-length = 120
89+
90+
[tool.ruff.lint]
91+
ignore = ["E501"]
92+
select = [
93+
"B",
94+
"B9",
95+
"C",
96+
"E",
97+
"F",
98+
"I",
99+
"S",
100+
"W",
101+
]
102+
103+
[tool.ruff.lint.mccabe]
104+
max-complexity = 25

src/openapi_python_generator/__init__.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
"""Python client from an OPENAPI 3.0+ specification in seconds."""
22

33
try:
4-
from importlib.metadata import PackageNotFoundError # type: ignore
5-
from importlib.metadata import version
4+
from importlib.metadata import (
5+
PackageNotFoundError, # type: ignore
6+
version,
7+
)
68
except ImportError: # pragma: no cover
7-
from importlib_metadata import PackageNotFoundError # type: ignore
8-
from importlib_metadata import version # type: ignore
9+
from importlib_metadata import (
10+
PackageNotFoundError, # type: ignore
11+
version, # type: ignore
12+
)
913

1014
try:
1115
__version__ = version(__name__)

src/openapi_python_generator/common.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from enum import Enum
2-
from typing import Dict
3-
from typing import Optional
2+
from typing import Dict, Optional
43

54
from openapi_python_generator.models import LibraryConfig
65

src/openapi_python_generator/generate_data.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
from pathlib import Path
2-
from typing import List
3-
from typing import Optional
4-
from typing import Union
2+
from typing import List, Optional, Union
53

64
import black
7-
from black.report import NothingChanged # type: ignore
85
import click
96
import httpx
107
import isort
118
import orjson
129
import yaml # type: ignore
13-
from httpx import ConnectError
14-
from httpx import ConnectTimeout
10+
from black.report import NothingChanged # type: ignore
11+
from httpx import ConnectError, ConnectTimeout
1512
from pydantic import ValidationError
1613

1714
from .common import FormatOptions, Formatter, HTTPLibrary, PydanticVersion
18-
from .language_converters.python.jinja_config import SERVICE_TEMPLATE
19-
from .language_converters.python.jinja_config import create_jinja_env
15+
from .language_converters.python.jinja_config import SERVICE_TEMPLATE, create_jinja_env
2016
from .models import ConversionResult
21-
from .version_detector import detect_openapi_version
2217
from .parsers import (
23-
parse_openapi_3_0,
24-
parse_openapi_3_1,
2518
generate_code_3_0,
2619
generate_code_3_1,
20+
parse_openapi_3_0,
21+
parse_openapi_3_1,
2722
)
23+
from .version_detector import detect_openapi_version
2824

2925

3026
def write_code(path: Path, content: str, formatter: Formatter) -> None:

src/openapi_python_generator/language_converters/python/api_config_generator.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
from openapi_python_generator.language_converters.python.jinja_config import (
77
API_CONFIG_TEMPLATE,
88
API_CONFIG_TEMPLATE_PYDANTIC_V2,
9-
)
10-
from openapi_python_generator.language_converters.python.jinja_config import (
119
create_jinja_env,
1210
)
1311
from openapi_python_generator.models import APIConfig

src/openapi_python_generator/language_converters/python/common.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import re
33
from typing import Optional
44

5-
65
_use_orjson: bool = False
76
_custom_template_path: str = None
87
_symbol_ascii_strip_re = re.compile(r"[^A-Za-z0-9_]")

src/openapi_python_generator/language_converters/python/generator.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
from openapi_python_generator.language_converters.python.service_generator import (
1515
generate_services,
1616
)
17-
from openapi_python_generator.models import ConversionResult
18-
from openapi_python_generator.models import LibraryConfig
17+
from openapi_python_generator.models import ConversionResult, LibraryConfig
1918

2019
# Type alias for both OpenAPI versions
2120
OpenAPISpec = Union[OpenAPI30, OpenAPI31]

0 commit comments

Comments
 (0)