Skip to content

Commit 6d39daa

Browse files
anggaoanggao
committed
fix lint
1 parent ab3a11c commit 6d39daa

File tree

5 files changed

+65
-30
lines changed

5 files changed

+65
-30
lines changed

‎operator/hack/create_graph_openapi_schema.py

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@
33
import sys
44
import copy
55

6+
67
def getOpts(cmd_line_args):
7-
parser = argparse.ArgumentParser(description="Create graph OpenAPI schema patch. Takes an input template and output Kustomize path for given number of levels")
8+
parser = argparse.ArgumentParser(
9+
description="Create graph OpenAPI schema patch. Takes an input template and output Kustomize path for given number of levels"
10+
)
811
parser.add_argument("template", help="the yaml template for 1 level of the graph")
912
parser.add_argument("path", help="the output path to save result")
10-
parser.add_argument("--levels", help="the number of levels to create", type=int, default=10)
13+
parser.add_argument(
14+
"--levels", help="the number of levels to create", type=int, default=10
15+
)
1116
opts = parser.parse_args(cmd_line_args)
1217
return opts
1318

19+
1420
def expand_tmpl(filename, levels):
1521
with open(filename, "r") as stream:
1622
y = yaml.safe_load(stream)
@@ -19,15 +25,20 @@ def expand_tmpl(filename, levels):
1925
child = copy.deepcopy(tmpl)
2026
tmpl["properties"]["children"]["items"] = child
2127
tmpl = child
22-
if i == levels-1:
28+
if i == levels - 1:
2329
del tmpl["properties"]["children"]
2430
# add replace for second and third schema version
2531
y.append(copy.deepcopy(y[0]))
26-
y[1]["path"] = "/spec/versions/1/schema/openAPIV3Schema/properties/spec/properties/predictors/items/properties/graph"
32+
y[1][
33+
"path"
34+
] = "/spec/versions/1/schema/openAPIV3Schema/properties/spec/properties/predictors/items/properties/graph"
2735
y.append(copy.deepcopy(y[0]))
28-
y[2]["path"] = "/spec/versions/2/schema/openAPIV3Schema/properties/spec/properties/predictors/items/properties/graph"
36+
y[2][
37+
"path"
38+
] = "/spec/versions/2/schema/openAPIV3Schema/properties/spec/properties/predictors/items/properties/graph"
2939
return y
3040

41+
3142
def main(argv):
3243
opts = getOpts(argv[1:])
3344
print(opts)
@@ -36,5 +47,6 @@ def main(argv):
3647
with open(opts.path, "w") as outfile:
3748
outfile.write(fdata)
3849

50+
3951
if __name__ == "__main__":
40-
main(sys.argv)
52+
main(sys.argv)

‎operator/hack/csv_hack.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,26 @@
22
import argparse
33
import sys
44

5+
56
def getOpts(cmd_line_args):
67
parser = argparse.ArgumentParser(description="remove csv CRD versions")
78
parser.add_argument("path", help="the output path to save result")
89
opts = parser.parse_args(cmd_line_args)
910
return opts
1011

12+
1113
def remove_versions(filename):
1214
with open(filename, "r") as stream:
1315
y = yaml.safe_load(stream)
1416
del y["spec"]["customresourcedefinitions"]["owned"][2]
1517
del y["spec"]["customresourcedefinitions"]["owned"][1]
1618
return y
1719

20+
1821
def str_presenter(dumper, data):
19-
if len(data.splitlines()) > 1: # check for multiline string
20-
return dumper.represent_scalar('tag:yaml.org,2002:str', data, style='|')
21-
return dumper.represent_scalar('tag:yaml.org,2002:str', data)
22+
if len(data.splitlines()) > 1: # check for multiline string
23+
return dumper.represent_scalar("tag:yaml.org,2002:str", data, style="|")
24+
return dumper.represent_scalar("tag:yaml.org,2002:str", data)
2225

2326

2427
def main(argv):
@@ -32,4 +35,4 @@ def main(argv):
3235

3336
if __name__ == "__main__":
3437
yaml.add_representer(str, str_presenter)
35-
main(sys.argv)
38+
main(sys.argv)

‎operator/helm/split_resources.py

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
HELM_CERTMANAGER_IF_START = "{{- if .Values.certManager.enabled -}}\n"
2121
HELM_NOT_CERTMANAGER_IF_START = "{{- if not .Values.certManager.enabled -}}\n"
2222
HELM_VERSION_IF_START = (
23-
'{{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}\n'
23+
'{{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}\n'
2424
)
2525
HELM_KUBEFLOW_IF_START = "{{- if .Values.kubeflow }}\n"
2626
HELM_KUBEFLOW_IF_NOT_START = "{{- if not .Values.kubeflow }}\n"
@@ -95,10 +95,21 @@ def helm_release(value: str):
9595
filename = args.folder + "/" + (kind + "_" + name).lower() + ".yaml"
9696
print(filename)
9797
print(version)
98-
if filename == (args.folder + "/" + "customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml") \
99-
and version == "apiextensions.k8s.io/v1":
98+
if (
99+
filename
100+
== (
101+
args.folder
102+
+ "/"
103+
+ "customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml"
104+
)
105+
and version == "apiextensions.k8s.io/v1"
106+
):
100107
print("MATCH")
101-
filename = args.folder + "/" + "customresourcedefinition_v1_seldondeployments.machinelearning.seldon.io.yaml"
108+
filename = (
109+
args.folder
110+
+ "/"
111+
+ "customresourcedefinition_v1_seldondeployments.machinelearning.seldon.io.yaml"
112+
)
102113

103114
print("Processing ", file)
104115
# Update common labels
@@ -368,16 +379,28 @@ def helm_release(value: str):
368379
fdata = HELM_CERTMANAGER_IF_START + fdata + HELM_IF_END
369380
elif name == "seldon-webhook-server-cert" and kind == "secret":
370381
fdata = HELM_NOT_CERTMANAGER_IF_START + fdata + HELM_IF_END
371-
elif name == "seldondeployments.machinelearning.seldon.io" and \
372-
version == "apiextensions.k8s.io/v1beta1":
373-
fdata = HELM_CRD_IF_START + \
374-
HELM_K8S_V1BETA1_CRD_IF_START + fdata + \
375-
HELM_IF_END + HELM_IF_END
376-
elif name == "seldondeployments.machinelearning.seldon.io" and \
377-
version == "apiextensions.k8s.io/v1":
378-
fdata = HELM_CRD_IF_START + \
379-
HELM_K8S_V1_CRD_IF_START + fdata + \
380-
HELM_IF_END + HELM_IF_END
382+
elif (
383+
name == "seldondeployments.machinelearning.seldon.io"
384+
and version == "apiextensions.k8s.io/v1beta1"
385+
):
386+
fdata = (
387+
HELM_CRD_IF_START
388+
+ HELM_K8S_V1BETA1_CRD_IF_START
389+
+ fdata
390+
+ HELM_IF_END
391+
+ HELM_IF_END
392+
)
393+
elif (
394+
name == "seldondeployments.machinelearning.seldon.io"
395+
and version == "apiextensions.k8s.io/v1"
396+
):
397+
fdata = (
398+
HELM_CRD_IF_START
399+
+ HELM_K8S_V1_CRD_IF_START
400+
+ fdata
401+
+ HELM_IF_END
402+
+ HELM_IF_END
403+
)
381404
elif kind == "service" and name == "seldon-webhook-service":
382405
fdata = HELM_CREATERESOURCES_IF_START + fdata + HELM_IF_END
383406
elif kind == "configmap" and name == "seldon-config":
@@ -468,7 +491,7 @@ def helm_release(value: str):
468491
)
469492
webhookData = webhookData + "\n" + HELM_IF_END
470493

471-
print("Webhook data len",len(webhookData))
494+
print("Webhook data len", len(webhookData))
472495

473496
filename = args.folder + "/" + "webhook.yaml"
474497
with open(filename, "w") as outfile:

‎python/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ setup_linter:
9999

100100
fmt:
101101
black \
102-
./ ../testing ../operator/helm ../operator/seldon-operator/hack \
102+
./ ../testing ../operator/helm ../operator/hack \
103103
--exclude "(testing/scripts/proto|seldon_core/proto/|.eggs|.tox)"
104104

105105
lint: licenses

‎python/seldon_core/microservice.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,7 @@ def main():
314314
)
315315

316316
parser.add_argument(
317-
"--pidfile",
318-
type=str,
319-
default=None,
320-
help="A file path to use for the PID file",
317+
"--pidfile", type=str, default=None, help="A file path to use for the PID file",
321318
)
322319

323320
args = parser.parse_args()

0 commit comments

Comments
 (0)