Skip to content

Commit 62d5f27

Browse files
committed
PUC-740: linting
1 parent cbcf2c2 commit 62d5f27

File tree

10 files changed

+60
-22
lines changed

10 files changed

+60
-22
lines changed

python/diff-nautobot-understack/diff_nautobot_understack/cli.py

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
from typing import Optional
2-
31
import typer
42
from diffsync.diff import Diff
5-
from diff_nautobot_understack.project.main import (
6-
openstack_project_diff_from_nautobot_tenant,
7-
)
3+
from rich import print
4+
from rich.console import Console
5+
from rich.table import Table
6+
87
from diff_nautobot_understack.network.main import (
98
openstack_network_diff_from_ucvni_network,
109
)
10+
from diff_nautobot_understack.project.main import (
11+
openstack_project_diff_from_nautobot_tenant,
12+
)
1113
from diff_nautobot_understack.settings import app_settings as settings
12-
from rich.console import Console
13-
from rich.table import Table
14-
from rich import print
1514

1615
app = typer.Typer(
1716
name="diff",
@@ -25,7 +24,7 @@
2524

2625

2726
def display_output(
28-
diff_result: Diff, diff_output: str, output_format: Optional[str] = None
27+
diff_result: Diff, diff_output: str, output_format: str | None = None
2928
):
3029
print(diff_result.summary())
3130
__output_format = (

python/diff-nautobot-understack/diff_nautobot_understack/clients/nautobot.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import requests
2-
import logging
31
import inspect
2+
import logging
43
from urllib.parse import urljoin
54

5+
import requests
6+
67
from diff_nautobot_understack.settings import app_settings as settings
78

89

python/diff-nautobot-understack/diff_nautobot_understack/network/adapters/openstack_network.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from diffsync import Adapter
2-
from diff_nautobot_understack.clients.openstack import API
32

3+
from diff_nautobot_understack.clients.openstack import API
44
from diff_nautobot_understack.network import models
55

66

python/diff-nautobot-understack/diff_nautobot_understack/network/adapters/ucvni.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from diffsync import Adapter
22
from pydantic import BaseModel
3-
from diff_nautobot_understack.clients.nautobot import API
43

4+
from diff_nautobot_understack.clients.nautobot import API
55
from diff_nautobot_understack.network import models
66

77

python/diff-nautobot-understack/diff_nautobot_understack/network/main.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from diffsync.diff import Diff
22
from diffsync.enum import DiffSyncFlags
3+
34
from diff_nautobot_understack.network.adapters.openstack_network import (
45
Network as OpenstackNetwork,
56
)

python/diff-nautobot-understack/diff_nautobot_understack/project/adapters/nautobot_tenant.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import uuid
22

33
from diffsync import Adapter
4-
from diff_nautobot_understack.clients.nautobot import API
54

5+
from diff_nautobot_understack.clients.nautobot import API
66
from diff_nautobot_understack.project import models
77

88

python/diff-nautobot-understack/diff_nautobot_understack/project/adapters/openstack_project.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from diffsync import Adapter
2-
from diff_nautobot_understack.clients.openstack import API
32

3+
from diff_nautobot_understack.clients.openstack import API
44
from diff_nautobot_understack.project import models
55

66

python/diff-nautobot-understack/diff_nautobot_understack/project/main.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from diffsync.diff import Diff
22
from diffsync.enum import DiffSyncFlags
3-
from diff_nautobot_understack.project.adapters.openstack_project import Project
3+
44
from diff_nautobot_understack.project.adapters.nautobot_tenant import Tenant
5+
from diff_nautobot_understack.project.adapters.openstack_project import Project
56
from diff_nautobot_understack.settings import app_settings as settings
67

78

python/diff-nautobot-understack/diff_nautobot_understack/settings.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
from typing import Optional
2-
3-
from pydantic_settings import BaseSettings, SettingsConfigDict
1+
from pydantic_settings import BaseSettings
2+
from pydantic_settings import SettingsConfigDict
43

54

65
class Settings(BaseSettings):
76
model_config = SettingsConfigDict(env_file="./.env", env_file_encoding="utf-8")
87

9-
nautobot_api_token: Optional[str] = None
8+
nautobot_api_token: str | None = None
109
nautobot_url: str = "https://nautobot.dev.undercloud.rackspace.net"
1110
debug: bool = False
12-
os_cloud: Optional[str] = None
11+
os_cloud: str | None = None
1312
os_project: str = "default"
14-
os_client_config_file: Optional[str] = None
13+
os_client_config_file: str | None = None
1514
output_format: str = "table"
1615

1716

python/diff-nautobot-understack/pyproject.toml

+37
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,43 @@ diffsync = "^2.0.1"
1414
typer = "^0.15.1"
1515
pydantic-settings = "^2.7.1"
1616

17+
[tool.ruff]
18+
target-version = "py311"
19+
fix = true
20+
21+
[tool.ruff.lint]
22+
select = [
23+
"D", # pydocstyle
24+
"E", # pycodestyle (error)
25+
"F", # pyflakes
26+
"B", # flake8-bugbear
27+
"I", # isort
28+
"S", # flake8-bandit
29+
"UP", # pyupgrade
30+
"ASYNC", # flake8-async
31+
]
32+
33+
ignore = [
34+
"D100", # don't require docs for every module
35+
"D101", # don't require docs for every class
36+
"D102", # don't require docs for every class method
37+
"D103", # don't require docs for every function
38+
"D104", # don't require docs for every package
39+
"D106", # don't require docs for every nested class
40+
"D107", # don't require docs for __init__
41+
"D417" # don't require docs for every function parameter
42+
]
43+
44+
[tool.ruff.lint.isort]
45+
force-single-line = true
46+
47+
[tool.ruff.lint.pydocstyle]
48+
# enable the google doc style rules by default
49+
convention = "google"
50+
51+
[tool.ruff.lint.per-file-ignores]
52+
"diff_nautobot_understack/cli.py" = ["D415"]
53+
1754
[tool.poetry.scripts]
1855
uc-diff = "diff_nautobot_understack.cli:app"
1956

0 commit comments

Comments
 (0)