Skip to content

Commit 22b467d

Browse files
bump kubernetes version for common image
1 parent 57f3c6c commit 22b467d

File tree

7 files changed

+221
-146
lines changed

7 files changed

+221
-146
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ repos:
4343
args: [--ignore-missing-imports]
4444

4545
- repo: https://github.com/psf/black
46-
rev: 20.8b1
46+
rev: 22.3.0
4747
hooks:
4848
- id: black
4949

.prow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ presubmits:
66
context: aicoe-ci/prow/pre-commit
77
spec:
88
containers:
9-
- image: quay.io/thoth-station/thoth-precommit-py38:v0.12.5
9+
- image: quay.io/thoth-station/thoth-precommit-py38:v0.12.7
1010
command:
1111
- "pre-commit"
1212
- "run"

Pipfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ argo-workflows = ">=3.5,<4"
88
daiquiri = "*"
99
requests = "*"
1010
sentry-sdk = "*"
11-
kubernetes = "~=11.0.0" # required pyyaml>=3.12
12-
openshift = "==0.11.0"
11+
kubernetes = ">=12.0.1" # required pyyaml>=5.3.1
12+
openshift = "==0.12.0"
1313
attrs = "*"
14-
pyyaml = ">=3.12"
14+
pyyaml = ">=5.3.1"
1515
flexmock = "*"
1616
jsonformatter = "*"
1717

Pipfile.lock

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

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jsonformatter
77
attrs
88
pyyaml
99
requests
10-
kubernetes ~= 11.0.0
11-
openshift==0.11.0
10+
kubernetes >=12.0.0
11+
openshift==0.12.0
1212
argo-workflows >=3.5,<4

thoth/common/logging.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@ def init_logging(
321321
sentry_sdk_init(
322322
_SENTRY_DSN,
323323
environment=environment,
324-
integrations=integrations,
324+
integrations=integrations, # type: ignore
325325
before_send=before_send_handler,
326-
**sentry_sdk_init_kwargs,
326+
**sentry_sdk_init_kwargs, # type: ignore
327327
)
328328
except Exception:
329329
root_logger.exception(

thoth/common/openshift.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,37 +1778,37 @@ def parse_memory_spec(memory_spec: typing.Optional[str]) -> typing.Optional[floa
17781778

17791779
if memory_spec.endswith("E"):
17801780
parsed = float(memory_spec[:-1])
1781-
return parsed * 1000 ** 6
1781+
return parsed * 1000**6
17821782
elif memory_spec.endswith("P"):
17831783
parsed = float(memory_spec[:-1])
1784-
return parsed * 1000 ** 5
1784+
return parsed * 1000**5
17851785
elif memory_spec.endswith("T"):
17861786
parsed = float(memory_spec[:-1])
1787-
return parsed * 1000 ** 4
1787+
return parsed * 1000**4
17881788
elif memory_spec.endswith("G"):
17891789
parsed = float(memory_spec[:-1])
1790-
return parsed * 1000 ** 3
1790+
return parsed * 1000**3
17911791
elif memory_spec.endswith("M"):
17921792
parsed = float(memory_spec[:-1])
1793-
return parsed * 1000 ** 2
1793+
return parsed * 1000**2
17941794
elif memory_spec.endswith("K"):
17951795
parsed = float(memory_spec[:-1])
17961796
return parsed * 1000
17971797
elif memory_spec.endswith("Ei"):
17981798
parsed = float(memory_spec[:-2])
1799-
return parsed * 1024 ** 6
1799+
return parsed * 1024**6
18001800
elif memory_spec.endswith("Pi"):
18011801
parsed = float(memory_spec[:-2])
1802-
return parsed * 1024 ** 5
1802+
return parsed * 1024**5
18031803
elif memory_spec.endswith("Ti"):
18041804
parsed = float(memory_spec[:-2])
1805-
return parsed * 1024 ** 4
1805+
return parsed * 1024**4
18061806
elif memory_spec.endswith("Gi"):
18071807
parsed = float(memory_spec[:-2])
1808-
return parsed * 1024 ** 3
1808+
return parsed * 1024**3
18091809
elif memory_spec.endswith("Mi"):
18101810
parsed = float(memory_spec[:-2])
1811-
return parsed * 1024 ** 2
1811+
return parsed * 1024**2
18121812
elif memory_spec.endswith("Ki"):
18131813
parsed = float(memory_spec[:-2])
18141814
return parsed * 1024

0 commit comments

Comments
 (0)