Skip to content

Commit d66ec12

Browse files
TeddyAndrieuxTeddyAndrieux
committed
Format all Python code with black
Fixes: #2650
1 parent 25480da commit d66ec12

File tree

136 files changed

+7799
-7767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+7799
-7767
lines changed

‎buildchain/buildchain/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212

1313
# Root of the repository.
14-
ROOT: Path = (Path(__file__)/'../../../').resolve()
14+
ROOT: Path = (Path(__file__) / "../../../").resolve()

‎buildchain/buildchain/builder.py

+71-56
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ def task__build_builder() -> Iterator[types.TaskDict]:
2020
yield builder.task
2121

2222

23-
def _builder_image(
24-
name: str, dockerfile: Path, **kwargs: Any
25-
) -> LocalImage:
23+
def _builder_image(name: str, dockerfile: Path, **kwargs: Any) -> LocalImage:
2624
"""Create a builder image.
2725
2826
Arguments:
@@ -32,96 +30,113 @@ def _builder_image(
3230
Keyword Arguments:
3331
They are passed to `LocalImage` init method.
3432
"""
35-
img_name = '{}-{}-builder'.format(config.PROJECT_NAME.lower(), name)
36-
kwargs.setdefault('task_dep', []).append('_build_root')
33+
img_name = "{}-{}-builder".format(config.PROJECT_NAME.lower(), name)
34+
kwargs.setdefault("task_dep", []).append("_build_root")
3735

3836
return LocalImage(
3937
name=img_name,
40-
version='latest',
38+
version="latest",
4139
dockerfile=dockerfile,
4240
destination=config.BUILD_ROOT,
4341
save_on_disk=False,
4442
**kwargs
4543
)
4644

4745

48-
RPM_BUILDER : Dict[str, LocalImage] = {
49-
'7': _builder_image(
50-
name='redhat-7-rpm',
51-
dockerfile=constants.ROOT/'packages/redhat/7/Dockerfile',
52-
build_context=constants.ROOT/'packages/redhat',
46+
RPM_BUILDER: Dict[str, LocalImage] = {
47+
"7": _builder_image(
48+
name="redhat-7-rpm",
49+
dockerfile=constants.ROOT / "packages/redhat/7/Dockerfile",
50+
build_context=constants.ROOT / "packages/redhat",
5351
file_dep=[
54-
constants.ROOT/'packages'/'redhat'/'common'/
55-
'yum_repositories'/'kubernetes.repo',
56-
constants.ROOT/'packages'/'redhat'/'common'/
57-
'yum_repositories'/'saltstack.repo',
52+
constants.ROOT
53+
/ "packages"
54+
/ "redhat"
55+
/ "common"
56+
/ "yum_repositories"
57+
/ "kubernetes.repo",
58+
constants.ROOT
59+
/ "packages"
60+
/ "redhat"
61+
/ "common"
62+
/ "yum_repositories"
63+
/ "saltstack.repo",
5864
],
5965
build_args={
6066
# Used to template the SaltStack repository definition
61-
'SALT_VERSION': versions.SALT_VERSION,
67+
"SALT_VERSION": versions.SALT_VERSION,
6268
},
6369
),
64-
'8': _builder_image(
65-
name='redhat-8-rpm',
66-
dockerfile=constants.ROOT/'packages/redhat/8/Dockerfile',
67-
build_context=constants.ROOT/'packages/redhat',
70+
"8": _builder_image(
71+
name="redhat-8-rpm",
72+
dockerfile=constants.ROOT / "packages/redhat/8/Dockerfile",
73+
build_context=constants.ROOT / "packages/redhat",
6874
file_dep=[
69-
constants.ROOT/'packages'/'redhat'/'common'/
70-
'yum_repositories'/'kubernetes.repo',
71-
constants.ROOT/'packages'/'redhat'/'common'/
72-
'yum_repositories'/'saltstack.repo',
75+
constants.ROOT
76+
/ "packages"
77+
/ "redhat"
78+
/ "common"
79+
/ "yum_repositories"
80+
/ "kubernetes.repo",
81+
constants.ROOT
82+
/ "packages"
83+
/ "redhat"
84+
/ "common"
85+
/ "yum_repositories"
86+
/ "saltstack.repo",
7387
],
7488
build_args={
7589
# Used to template the SaltStack repository definition
76-
'SALT_VERSION': versions.SALT_VERSION,
90+
"SALT_VERSION": versions.SALT_VERSION,
7791
},
7892
),
7993
}
8094

81-
DEB_BUILDER : Dict[str, LocalImage] = {
82-
'18.04': _builder_image(
83-
name='ubuntu-18.04-deb',
84-
dockerfile=constants.ROOT/'packages/debian/18.04/Dockerfile',
85-
build_context=constants.ROOT/'packages/debian',
95+
DEB_BUILDER: Dict[str, LocalImage] = {
96+
"18.04": _builder_image(
97+
name="ubuntu-18.04-deb",
98+
dockerfile=constants.ROOT / "packages/debian/18.04/Dockerfile",
99+
build_context=constants.ROOT / "packages/debian",
86100
),
87101
}
88102

89-
DOC_BUILDER : LocalImage = _builder_image(
90-
name='doc',
91-
dockerfile=constants.ROOT/'docs/Dockerfile',
103+
DOC_BUILDER: LocalImage = _builder_image(
104+
name="doc",
105+
dockerfile=constants.ROOT / "docs/Dockerfile",
92106
build_context=constants.ROOT,
93-
file_dep=[
94-
constants.ROOT/'tox.ini', constants.ROOT/'docs/requirements.txt'
95-
]
107+
file_dep=[constants.ROOT / "tox.ini", constants.ROOT / "docs/requirements.txt"],
96108
)
97109

98-
GO_BUILDER : LocalImage = _builder_image(
99-
name='go',
100-
dockerfile=constants.STORAGE_OPERATOR_ROOT/'Dockerfile',
110+
GO_BUILDER: LocalImage = _builder_image(
111+
name="go",
112+
dockerfile=constants.STORAGE_OPERATOR_ROOT / "Dockerfile",
101113
file_dep=[
102-
constants.STORAGE_OPERATOR_ROOT/'go.mod',
103-
constants.STORAGE_OPERATOR_ROOT/'go.sum',
104-
]
114+
constants.STORAGE_OPERATOR_ROOT / "go.mod",
115+
constants.STORAGE_OPERATOR_ROOT / "go.sum",
116+
],
105117
)
106118

107-
UI_BUILDER : LocalImage = _builder_image(
108-
name='ui',
109-
dockerfile=constants.ROOT/'ui'/'Dockerfile',
110-
build_args={'NODE_IMAGE_VERSION': versions.NODEJS_IMAGE_VERSION},
119+
UI_BUILDER: LocalImage = _builder_image(
120+
name="ui",
121+
dockerfile=constants.ROOT / "ui" / "Dockerfile",
122+
build_args={"NODE_IMAGE_VERSION": versions.NODEJS_IMAGE_VERSION},
111123
file_dep=[
112-
constants.ROOT/'ui'/'package.json',
113-
constants.ROOT/'ui'/'package-lock.json',
114-
constants.ROOT/'ui'/'entrypoint.sh',
115-
]
124+
constants.ROOT / "ui" / "package.json",
125+
constants.ROOT / "ui" / "package-lock.json",
126+
constants.ROOT / "ui" / "entrypoint.sh",
127+
],
116128
)
117129

118130

119-
_BUILDERS : Tuple[LocalImage, ...] = (
120-
DOC_BUILDER,
121-
GO_BUILDER,
122-
UI_BUILDER,
123-
) + tuple(RPM_BUILDER.values()) \
124-
+ tuple(DEB_BUILDER.values())
131+
_BUILDERS: Tuple[LocalImage, ...] = (
132+
(
133+
DOC_BUILDER,
134+
GO_BUILDER,
135+
UI_BUILDER,
136+
)
137+
+ tuple(RPM_BUILDER.values())
138+
+ tuple(DEB_BUILDER.values())
139+
)
125140

126141

127142
__all__ = utils.export_only_tasks(__name__)

‎buildchain/buildchain/codegen.py

+13-14
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from buildchain import types
1515
from buildchain import utils
1616

17+
1718
def task_codegen() -> Iterator[types.TaskDict]:
1819
"""Run the code generation tools."""
1920
for create_codegen_task in CODEGEN:
@@ -22,28 +23,26 @@ def task_codegen() -> Iterator[types.TaskDict]:
2223

2324
def codegen_go() -> types.TaskDict:
2425
"""Generate Go code using operator-sdk."""
25-
cwd = constants.STORAGE_OPERATOR_ROOT
26+
cwd = constants.STORAGE_OPERATOR_ROOT
2627
actions = []
27-
for target in ('k8s', 'crds'):
28-
cmd = ' '.join(map(shlex.quote, [
29-
config.ExtCommand.OPERATOR_SDK.value, 'generate', target
30-
]))
28+
for target in ("k8s", "crds"):
29+
cmd = " ".join(
30+
map(shlex.quote, [config.ExtCommand.OPERATOR_SDK.value, "generate", target])
31+
)
3132
actions.append(doit.action.CmdAction(cmd, cwd=cwd))
3233

3334
return {
34-
'name': 'go',
35-
'title': utils.title_with_subtask_name('CODEGEN'),
36-
'doc': codegen_go.__doc__,
37-
'actions': actions,
38-
'task_dep': ['check_for:operator-sdk'],
39-
'file_dep': list(constants.STORAGE_OPERATOR_SOURCES),
35+
"name": "go",
36+
"title": utils.title_with_subtask_name("CODEGEN"),
37+
"doc": codegen_go.__doc__,
38+
"actions": actions,
39+
"task_dep": ["check_for:operator-sdk"],
40+
"file_dep": list(constants.STORAGE_OPERATOR_SOURCES),
4041
}
4142

4243

4344
# List of available code generation tasks.
44-
CODEGEN : Tuple[Callable[[], types.TaskDict], ...] = (
45-
codegen_go,
46-
)
45+
CODEGEN: Tuple[Callable[[], types.TaskDict], ...] = (codegen_go,)
4746

4847

4948
__all__ = utils.export_only_tasks(__name__)

‎buildchain/buildchain/config.py

+29-25
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,31 @@
2121

2222

2323
# Project name.
24-
PROJECT_NAME : str = os.getenv('PROJECT_NAME', 'MetalK8s')
24+
PROJECT_NAME: str = os.getenv("PROJECT_NAME", "MetalK8s")
2525

2626
# Path to the root of the build directory.
27-
BUILD_ROOT : Path = Path(os.getenv('BUILD_ROOT', '_build'))
27+
BUILD_ROOT: Path = Path(os.getenv("BUILD_ROOT", "_build"))
2828
if not BUILD_ROOT.is_absolute():
29-
BUILD_ROOT = ROOT/BUILD_ROOT
29+
BUILD_ROOT = ROOT / BUILD_ROOT
3030
BUILD_ROOT = BUILD_ROOT.resolve()
3131

3232
# Vagrant configuration.
33-
VAGRANT_PROVIDER : str = os.getenv('VAGRANT_PROVIDER', 'virtualbox')
34-
_DEFAULT_VAGRANT_UP_ARGS : str = ' '.join((
35-
'--provision',
36-
'--no-destroy-on-error',
37-
'--parallel',
38-
'--provider', VAGRANT_PROVIDER
39-
))
40-
41-
VAGRANT_SNAPSHOT_NAME: str = 'bootstrap.autosnapshot'
42-
43-
VAGRANT_UP_ARGS : Tuple[str, ...] = tuple(shlex.split(
44-
os.getenv('VAGRANT_UP_ARGS', _DEFAULT_VAGRANT_UP_ARGS)
45-
))
33+
VAGRANT_PROVIDER: str = os.getenv("VAGRANT_PROVIDER", "virtualbox")
34+
_DEFAULT_VAGRANT_UP_ARGS: str = " ".join(
35+
(
36+
"--provision",
37+
"--no-destroy-on-error",
38+
"--parallel",
39+
"--provider",
40+
VAGRANT_PROVIDER,
41+
)
42+
)
43+
44+
VAGRANT_SNAPSHOT_NAME: str = "bootstrap.autosnapshot"
45+
46+
VAGRANT_UP_ARGS: Tuple[str, ...] = tuple(
47+
shlex.split(os.getenv("VAGRANT_UP_ARGS", _DEFAULT_VAGRANT_UP_ARGS))
48+
)
4649

4750
# External commands {{{
4851

@@ -52,22 +55,23 @@
5255
class ExtCommand(enum.Enum):
5356
"""External commands used by the build chain."""
5457

55-
GIT = os.getenv('GIT_BIN', 'git')
56-
HARDLINK = os.getenv('HARDLINK_BIN', 'hardlink')
57-
IMPLANTISOMD5 = os.getenv('IMPLANTISOMD5_BIN', 'implantisomd5')
58-
MKISOFS = os.getenv('MKISOFS_BIN', 'mkisofs')
59-
SKOPEO = os.getenv('SKOPEO_BIN', 'skopeo')
60-
VAGRANT = os.getenv('VAGRANT_BIN', 'vagrant')
61-
OPERATOR_SDK = os.getenv('OPERATOR_SDK_BIN', 'operator-sdk')
62-
GOFMT = os.getenv('GOFMT_BIN', 'gofmt')
58+
GIT = os.getenv("GIT_BIN", "git")
59+
HARDLINK = os.getenv("HARDLINK_BIN", "hardlink")
60+
IMPLANTISOMD5 = os.getenv("IMPLANTISOMD5_BIN", "implantisomd5")
61+
MKISOFS = os.getenv("MKISOFS_BIN", "mkisofs")
62+
SKOPEO = os.getenv("SKOPEO_BIN", "skopeo")
63+
VAGRANT = os.getenv("VAGRANT_BIN", "vagrant")
64+
OPERATOR_SDK = os.getenv("OPERATOR_SDK_BIN", "operator-sdk")
65+
GOFMT = os.getenv("GOFMT_BIN", "gofmt")
6366

6467
@property
6568
def command_name(self) -> str:
6669
"""Return the name of the command."""
6770
if self is self.OPERATOR_SDK:
68-
return 'operator-sdk'
71+
return "operator-sdk"
6972
# See https://github.com/PyCQA/pylint/issues/2062
7073
# pylint: disable=no-member
7174
return self.name.lower()
7275

76+
7377
# }}}

0 commit comments

Comments
 (0)