Skip to content

Commit ebcea27

Browse files
Laure-diLaure-di
authored
Merge branch 'main' into manual_1753793734
2 parents e5ad8ab + feb712a commit ebcea27

File tree

11 files changed

+203
-61
lines changed

11 files changed

+203
-61
lines changed

‎scaleway-async/poetry.lock‎

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

‎scaleway-async/pyproject.toml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,35 @@ build-backend = "poetry.core.masonry.api"
3939

4040
[tool.ruff.lint]
4141
ignore = ["E501"]
42+
select = [
43+
"ASYNC", # https://docs.astral.sh/ruff/rules/#flake8-async-async
44+
"B", # https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
45+
"ERA", # https://docs.astral.sh/ruff/rules/#eradicate-era
46+
"EXE",# https://docs.astral.sh/ruff/rules/#flake8-executable-exe
47+
"F",# https://docs.astral.sh/ruff/rules/#pyflakes-f
48+
"FBT", # https://docs.astral.sh/ruff/rules/#flake8-boolean-trap-fbt
49+
"FIX", # https://docs.astral.sh/ruff/rules/#flake8-fixme-fix
50+
"FLY",# https://docs.astral.sh/ruff/rules/#flynt-fly
51+
"FURB", # https://docs.astral.sh/ruff/rules/#refurb-furb
52+
"G",# https://docs.astral.sh/ruff/rules/#flake8-logging-format-g
53+
"ICN",# https://docs.astral.sh/ruff/rules/#flake8-import-conventions-icn
54+
"INT",# https://docs.astral.sh/ruff/rules/#flake8-gettext-int
55+
"ISC",# https://docs.astral.sh/ruff/rules/#flake8-implicit-str-concat-isc
56+
"LOG",# https://docs.astral.sh/ruff/rules/#flake8-logging-log
57+
"PERF",# https://docs.astral.sh/ruff/rules/#perflint-perf
58+
"PGH",# https://docs.astral.sh/ruff/rules/#pygrep-hooks-pgh
59+
"PYI",# https://docs.astral.sh/ruff/rules/#flake8-pyi-pyi
60+
"Q",# https://docs.astral.sh/ruff/rules/#flake8-quotes-q
61+
"RET", # https://docs.astral.sh/ruff/rules/#flake8-return-ret
62+
"RSE",# https://docs.astral.sh/ruff/rules/#flake8-raise-rse
63+
"SIM",# https://docs.astral.sh/ruff/rules/#flake8-simplify-sim
64+
"SLF",# https://docs.astral.sh/ruff/rules/#flake8-self-slf
65+
"SLOT",# https://docs.astral.sh/ruff/rules/#flake8-slots-slot
66+
"T10", # https://docs.astral.sh/ruff/rules/#flake8-debugger-t10
67+
"T20",# https://docs.astral.sh/ruff/rules/#flake8-print-t20
68+
"TD",# https://docs.astral.sh/ruff/rules/#flake8-todos-td
69+
"YTT", # https://docs.astral.sh/ruff/rules/#flake8-2020-ytt
70+
]
4271

4372
[tool.ty.rules]
4473
missing-argument = "ignore"

‎scaleway-async/tests/utils.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ def random_date(min: Union[str, datetime], max: Union[str, datetime]) -> datetim
2626
min_time = min if isinstance(min, datetime) else string_to_datetime(min)
2727
max_time = max if isinstance(max, datetime) else string_to_datetime(max)
2828

29-
random_time = min_time + system_random.random() * (max_time - min_time)
30-
return random_time
29+
return min_time + system_random.random() * (max_time - min_time)
3130

3231

3332
def datetime_to_string(date: datetime) -> str:

‎scaleway-core/pyproject.toml‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,60 @@ requires = ["poetry-core"]
4040
build-backend = "poetry.core.masonry.api"
4141

4242
[tool.ruff.lint]
43-
ignore = ["E501"]
43+
ignore = [
44+
"A", # flake8-builtins
45+
"ANN", # flake8-annotations
46+
"B", # flake8-bugbear
47+
"BLE", # flake8-blind-except
48+
"C90", # mccabe
49+
"COM", # flake8-commas
50+
"DTZ", # flake8-datetimez
51+
"E501",
52+
"EM", # flake8-errmsg
53+
"FA", # flake8-future-annotations
54+
"FBT", # flake8-boolean-trap
55+
"G", # flake8-logging-format
56+
"I", # isort
57+
"INP", # flake8-no-pep420
58+
"N", # pep8-naming
59+
"PERF", # Perflint
60+
"PL", # Pylint
61+
"PT", # flake8-pytest-style
62+
"RUF", # Ruff-specific rules
63+
"S", # flake8-bandit
64+
"SIM", # flake8-simplify
65+
"SLF", # flake8-self
66+
"TRY", # tryceratops
67+
"UP", # pyupgrade
68+
]
69+
select = [
70+
"ARG", # https://docs.astral.sh/ruff/rules/#flake8-unused-arguments-arg
71+
"ASYNC", # https://docs.astral.sh/ruff/rules/#flake8-async-async
72+
"C4", # https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
73+
"ERA", # https://docs.astral.sh/ruff/rules/#eradicate-era
74+
"EXE", # https://docs.astral.sh/ruff/rules/#flake8-executable-exe
75+
"F", # https://docs.astral.sh/ruff/rules/#pyflakes-f
76+
"FIX", # https://docs.astral.sh/ruff/rules/#flake8-fixme-fix
77+
"FLY", # https://docs.astral.sh/ruff/rules/#flynt-fly
78+
"FURB", # https://docs.astral.sh/ruff/rules/#refurb-furb
79+
"ICN", # https://docs.astral.sh/ruff/rules/#flake8-import-conventions-icn
80+
"INT", # https://docs.astral.sh/ruff/rules/#flake8-gettext-int
81+
"ISC", # https://docs.astral.sh/ruff/rules/#flake8-implicit-str-concat-isc
82+
"LOG", # https://docs.astral.sh/ruff/rules/#flake8-logging-log
83+
"PGH", # https://docs.astral.sh/ruff/rules/#pygrep-hooks-pgh
84+
"PIE", # https://docs.astral.sh/ruff/rules/#flake8-pie-pie
85+
"PYI", # https://docs.astral.sh/ruff/rules/#flake8-pyi-pyi
86+
"Q", # https://docs.astral.sh/ruff/rules/#flake8-quotes-q
87+
"RET", # https://docs.astral.sh/ruff/rules/#flake8-return-ret
88+
"RSE", # https://docs.astral.sh/ruff/rules/#flake8-raise-rse
89+
"SLOT", # https://docs.astral.sh/ruff/rules/#flake8-slots-slot
90+
"T10", # https://docs.astral.sh/ruff/rules/#flake8-debugger-t10
91+
"T20", # https://docs.astral.sh/ruff/rules/#flake8-print-t20
92+
"TC", # https://docs.astral.sh/ruff/rules/#flake8-type-checking-tc
93+
"TD", # https://docs.astral.sh/ruff/rules/#flake8-todos-td
94+
"TID", # https://docs.astral.sh/ruff/rules/#flake8-tidy-imports-tid
95+
"YTT", # https://docs.astral.sh/ruff/rules/#flake8-2020-ytt
96+
]
4497

4598
[tool.pyrefly.errors]
4699
import-error = false

‎scaleway-core/scaleway_core/utils/resolve_one_of.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
from __future__ import annotations
12
from collections.abc import Callable
23
from dataclasses import dataclass
34
from typing import Any, Dict, Generic, List, Optional, TypeVar
4-
from _typeshed import SupportsKeysAndGetItem
55

6-
from scaleway_core.profile import ProfileDefaults
6+
from typing import TYPE_CHECKING
7+
8+
if TYPE_CHECKING:
9+
from _typeshed import SupportsKeysAndGetItem
10+
711

812
T = TypeVar("T")
913

@@ -12,8 +16,8 @@
1216
class OneOfPossibility(Generic[T]):
1317
param: str
1418
value: Optional[T]
15-
default: Optional[T | ProfileDefaults] = None
16-
marshal_func: Optional[Callable[[T, T | None], Dict[str, Any]]] = None
19+
default: Optional[T] = None
20+
marshal_func: Optional[Callable[[T, T], Dict[str, Any]]] = None
1721

1822

1923
def resolve_one_of(
@@ -35,7 +39,6 @@ def resolve_one_of(
3539
}
3640
return {possibility.param: possibility.value}
3741

38-
# Try to resolve using non-None default
3942
for possibility in possibilities:
4043
if possibility.default is not None:
4144
if possibility.marshal_func is not None:

‎scaleway-core/tests/utils.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ def random_date(min: Union[str, datetime], max: Union[str, datetime]) -> datetim
2626
min_time = min if isinstance(min, datetime) else string_to_datetime(min)
2727
max_time = max if isinstance(max, datetime) else string_to_datetime(max)
2828

29-
random_time = min_time + system_random.random() * (max_time - min_time)
30-
return random_time
29+
return min_time + system_random.random() * (max_time - min_time)
3130

3231

3332
def datetime_to_string(date: datetime) -> str:

‎scaleway/pyproject.toml‎

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,62 @@ requires = ["poetry-core"]
3939
build-backend = "poetry.core.masonry.api"
4040

4141
[tool.ruff.lint]
42-
ignore = ["E501"]
42+
ignore = [
43+
"A",# flake8-builtins
44+
"ANN",# flake8-annotations
45+
"ARG",# flake8-unused-arguments
46+
"BLE",# flake8-blind-except
47+
"C4",# flake8-comprehensions
48+
"C90",# mccabe
49+
"COM",# flake8-commas
50+
"D",# pydocstyle
51+
"DTZ",# flake8-datetimez
52+
"E501",
53+
"EM",# flake8-errmsg
54+
"FA",# flake8-future-annotations
55+
"I",# isort
56+
"INP",# flake8-no-pep420
57+
"N",# pep8-naming
58+
"PIE",# flake8-pie
59+
"PL",# Pylint
60+
"PT",# flake8-pytest-style
61+
"RUF",# Ruff-specific rules
62+
"S",# flake8-bandit
63+
"SLF",# flake8-self
64+
"T20",# flake8-print
65+
"TC",# flake8-type-checking
66+
"TID",# flake8-tidy-imports
67+
"TRY",# tryceratops
68+
"UP",
69+
]
70+
select = [
71+
"ASYNC", # https://docs.astral.sh/ruff/rules/#flake8-async-async
72+
"B", # https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
73+
"ERA", # https://docs.astral.sh/ruff/rules/#eradicate-era
74+
"EXE", # https://docs.astral.sh/ruff/rules/#flake8-executable-exe
75+
"F", # https://docs.astral.sh/ruff/rules/#pyflakes-f
76+
"FBT", # https://docs.astral.sh/ruff/rules/#flake8-boolean-trap-fbt
77+
"FIX", # https://docs.astral.sh/ruff/rules/#flake8-fixme-fix
78+
"FLY", # https://docs.astral.sh/ruff/rules/#flynt-fly
79+
"FURB", # https://docs.astral.sh/ruff/rules/#refurb-furb
80+
"G", # https://docs.astral.sh/ruff/rules/#flake8-logging-format-g
81+
"ICN", # https://docs.astral.sh/ruff/rules/#flake8-import-conventions-icn
82+
"INT", # https://docs.astral.sh/ruff/rules/#flake8-gettext-int
83+
"ISC", # https://docs.astral.sh/ruff/rules/#flake8-implicit-str-concat-isc
84+
"LOG", # https://docs.astral.sh/ruff/rules/#flake8-logging-log
85+
"PERF", # https://docs.astral.sh/ruff/rules/#perflint-perf
86+
"PGH", # https://docs.astral.sh/ruff/rules/#pygrep-hooks-pgh
87+
"PTH", # https://docs.astral.sh/ruff/rules/#flake8-use-pathlib-pth
88+
"PYI", # https://docs.astral.sh/ruff/rules/#flake8-pyi-pyi
89+
"Q", # https://docs.astral.sh/ruff/rules/#flake8-quotes-q
90+
"RET", # https://docs.astral.sh/ruff/rules/#flake8-return-ret
91+
"RSE", # https://docs.astral.sh/ruff/rules/#flake8-raise-rse
92+
"SIM", # https://docs.astral.sh/ruff/rules/#flake8-simplify-sim
93+
"SLOT", # https://docs.astral.sh/ruff/rules/#flake8-slots-slot
94+
"T10", # https://docs.astral.sh/ruff/rules/#flake8-debugger-t10
95+
"TD", # https://docs.astral.sh/ruff/rules/#flake8-todos-td
96+
"YTT", # https://docs.astral.sh/ruff/rules/#flake8-2020-ytt
97+
]
4398

4499
[tool.pyrefly.errors]
45100
missing-attribute = false

‎scaleway/scaleway/instance/v1/custom_api.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ def get_all_server_user_data(
9595
print("value: ", value)
9696
user_data[key] = value.content
9797

98-
res = GetAllServerUserDataResponse(user_data=user_data)
99-
100-
return res
98+
return GetAllServerUserDataResponse(user_data=user_data)
10199

102100
def set_all_server_user_data(
103101
self,

0 commit comments

Comments
 (0)