Skip to content

Commit 2e55b15

Browse files
quantumsheepquantumsheep
authored
feat: export symbols using __all__ (#11)
1 parent 01e4aa4 commit 2e55b15

File tree

5 files changed

+173
-54
lines changed

5 files changed

+173
-54
lines changed

‎scaleway-async/scaleway_async/__init__.py

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,48 @@
44

55
__version__: str = pkg_resources.get_distribution(__name__).version
66

7-
from scaleway_core.api import API as API # noqa
7+
from scaleway_core.api import (
8+
API,
9+
ScalewayException,
10+
)
811

9-
from scaleway_core.client import Client as Client # noqa
12+
from scaleway_core.client import Client
1013

11-
from scaleway_core.profile import Profile as Profile # noqa
12-
from scaleway_core.profile import ProfileConfig as ProfileConfig # noqa
13-
from scaleway_core.profile import ProfileDefaults as ProfileDefaults # noqa
14+
from scaleway_core.profile import (
15+
Profile,
16+
ProfileConfig,
17+
ProfileDefaults,
18+
)
19+
20+
from scaleway_core.utils.waiter import (
21+
WaitForOptions,
22+
WaitForStopCondition,
23+
)
24+
25+
from scaleway_core.bridge import (
26+
Money,
27+
Region,
28+
Zone,
29+
ScwFile,
30+
ServiceInfo,
31+
TimeSeriesPoint,
32+
TimeSeries,
33+
)
34+
35+
__all__ = [
36+
"API",
37+
"ScalewayException",
38+
"Client",
39+
"Profile",
40+
"ProfileConfig",
41+
"ProfileDefaults",
42+
"WaitForOptions",
43+
"WaitForStopCondition",
44+
"Money",
45+
"Region",
46+
"Zone",
47+
"ScwFile",
48+
"ServiceInfo",
49+
"TimeSeriesPoint",
50+
"TimeSeries",
51+
]

‎scaleway-core/scaleway_core/bridge/__init__.py

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,37 @@
1-
from .money import Money as Money
2-
from .money import unmarshal_Money as unmarshal_Money
3-
from .money import marshal_Money as marshal_Money
1+
from .money import Money
2+
from .money import unmarshal_Money
3+
from .money import marshal_Money
44

5-
from .region import Region as Region
6-
from .zone import Zone as Zone
5+
from .region import Region
6+
from .zone import Zone
77

8-
from .scwfile import ScwFile as ScwFile
9-
from .scwfile import unmarshal_ScwFile as unmarshal_ScwFile
10-
from .scwfile import marshal_ScwFile as marshal_ScwFile
8+
from .scwfile import ScwFile
9+
from .scwfile import unmarshal_ScwFile
10+
from .scwfile import marshal_ScwFile
1111

12-
from .serviceinfo import ServiceInfo as ServiceInfo
13-
from .serviceinfo import unmarshal_ServiceInfo as unmarshal_ServiceInfo
14-
from .serviceinfo import marshal_ServiceInfo as marshal_ServiceInfo
12+
from .serviceinfo import ServiceInfo
13+
from .serviceinfo import unmarshal_ServiceInfo
14+
from .serviceinfo import marshal_ServiceInfo
1515

16-
from .timeseries import TimeSeriesPoint as TimeSeriesPoint
17-
from .timeseries import TimeSeries as TimeSeries
18-
from .timeseries import unmarshal_TimeSeries as unmarshal_TimeSeries
19-
from .timeseries import marshal_TimeSeries as marshal_TimeSeries
16+
from .timeseries import TimeSeriesPoint
17+
from .timeseries import TimeSeries
18+
from .timeseries import unmarshal_TimeSeries
19+
from .timeseries import marshal_TimeSeriesPoint
20+
21+
__all__ = [
22+
"Money",
23+
"unmarshal_Money",
24+
"marshal_Money",
25+
"Region",
26+
"Zone",
27+
"ScwFile",
28+
"unmarshal_ScwFile",
29+
"marshal_ScwFile",
30+
"ServiceInfo",
31+
"unmarshal_ServiceInfo",
32+
"marshal_ServiceInfo",
33+
"TimeSeriesPoint",
34+
"TimeSeries",
35+
"unmarshal_TimeSeries",
36+
"marshal_TimeSeriesPoint",
37+
]

‎scaleway-core/scaleway_core/profile/__init__.py

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
from .profile import ProfileDefaults as ProfileDefaults # noqa
2-
from .profile import ProfileConfig as ProfileConfig # noqa
3-
from .profile import Profile as Profile # noqa
4-
5-
from .env import ENV_KEY_SCW_CONFIG_PATH as ENV_KEY_SCW_CONFIG_PATH # noqa
6-
from .env import ENV_KEY_SCW_ACCESS_KEY as ENV_KEY_SCW_ACCESS_KEY # noqa
7-
from .env import ENV_KEY_SCW_SECRET_KEY as ENV_KEY_SCW_SECRET_KEY # noqa
8-
from .env import ENV_KEY_SCW_API_URL as ENV_KEY_SCW_API_URL # noqa
9-
from .env import (
10-
ENV_KEY_SCW_DEFAULT_ORGANIZATION_ID as ENV_KEY_SCW_DEFAULT_ORGANIZATION_ID,
11-
) # noqa
121
from .env import (
13-
ENV_KEY_SCW_DEFAULT_PROJECT_ID as ENV_KEY_SCW_DEFAULT_PROJECT_ID,
14-
) # noqa
15-
from .env import ENV_KEY_SCW_DEFAULT_REGION as ENV_KEY_SCW_DEFAULT_REGION # noqa
16-
from .env import ENV_KEY_SCW_DEFAULT_ZONE as ENV_KEY_SCW_DEFAULT_ZONE # noqa
2+
ENV_KEY_SCW_ACCESS_KEY,
3+
ENV_KEY_SCW_API_URL,
4+
ENV_KEY_SCW_CONFIG_PATH,
5+
ENV_KEY_SCW_DEFAULT_ORGANIZATION_ID,
6+
ENV_KEY_SCW_DEFAULT_PROJECT_ID,
7+
ENV_KEY_SCW_DEFAULT_REGION,
8+
ENV_KEY_SCW_DEFAULT_ZONE,
9+
ENV_KEY_SCW_SECRET_KEY,
10+
)
11+
from .profile import Profile, ProfileConfig, ProfileDefaults
12+
13+
__all__ = [
14+
"Profile",
15+
"ProfileConfig",
16+
"ProfileDefaults",
17+
"ENV_KEY_SCW_CONFIG_PATH",
18+
"ENV_KEY_SCW_ACCESS_KEY",
19+
"ENV_KEY_SCW_SECRET_KEY",
20+
"ENV_KEY_SCW_API_URL",
21+
"ENV_KEY_SCW_DEFAULT_ORGANIZATION_ID",
22+
"ENV_KEY_SCW_DEFAULT_PROJECT_ID",
23+
"ENV_KEY_SCW_DEFAULT_REGION",
24+
"ENV_KEY_SCW_DEFAULT_ZONE",
25+
]

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

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,36 @@
1-
from .fetch_all_pages import fetch_all_pages as fetch_all_pages
2-
from .fetch_all_pages import fetch_all_pages_async as fetch_all_pages_async
3-
4-
from .project_or_organization_id import (
5-
project_or_organization_id as project_or_organization_id,
1+
from .fetch_all_pages import (
2+
fetch_all_pages,
3+
fetch_all_pages_async,
64
)
75

8-
from .random_name import random_name as random_name
6+
from .project_or_organization_id import project_or_organization_id
7+
8+
from .random_name import random_name
99

10-
from .resolve_one_of import OneOfPossibility as OneOfPossibility
11-
from .resolve_one_of import resolve_one_of as resolve_one_of
10+
from .resolve_one_of import OneOfPossibility, resolve_one_of
1211

13-
from .strenum import StrEnum as StrEnum
12+
from .strenum import StrEnum
1413

15-
from .validate_path_param import validate_path_param as validate_path_param
14+
from .validate_path_param import validate_path_param
15+
16+
from .waiter import (
17+
WaitForOptions,
18+
WaitForStopCondition,
19+
wait_for_resource,
20+
wait_for_resource_async,
21+
)
1622

17-
from .waiter import WaitForOptions as WaitForOptions
18-
from .waiter import WaitForStopCondition as WaitForStopCondition
19-
from .waiter import wait_for_resource as wait_for_resource
20-
from .waiter import wait_for_resource_async as wait_for_resource_async
23+
__all__ = [
24+
"fetch_all_pages",
25+
"fetch_all_pages_async",
26+
"project_or_organization_id",
27+
"random_name",
28+
"OneOfPossibility",
29+
"resolve_one_of",
30+
"StrEnum",
31+
"validate_path_param",
32+
"WaitForOptions",
33+
"WaitForStopCondition",
34+
"wait_for_resource",
35+
"wait_for_resource_async",
36+
]

‎scaleway/scaleway/__init__.py

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,48 @@
44

55
__version__: str = pkg_resources.get_distribution(__name__).version
66

7-
from scaleway_core.api import API as API # noqa
7+
from scaleway_core.api import (
8+
API,
9+
ScalewayException,
10+
)
811

9-
from scaleway_core.client import Client as Client # noqa
12+
from scaleway_core.client import Client
1013

11-
from scaleway_core.profile import Profile as Profile # noqa
12-
from scaleway_core.profile import ProfileConfig as ProfileConfig # noqa
13-
from scaleway_core.profile import ProfileDefaults as ProfileDefaults # noqa
14+
from scaleway_core.profile import (
15+
Profile,
16+
ProfileConfig,
17+
ProfileDefaults,
18+
)
19+
20+
from scaleway_core.utils.waiter import (
21+
WaitForOptions,
22+
WaitForStopCondition,
23+
)
24+
25+
from scaleway_core.bridge import (
26+
Money,
27+
Region,
28+
Zone,
29+
ScwFile,
30+
ServiceInfo,
31+
TimeSeriesPoint,
32+
TimeSeries,
33+
)
34+
35+
__all__ = [
36+
"API",
37+
"ScalewayException",
38+
"Client",
39+
"Profile",
40+
"ProfileConfig",
41+
"ProfileDefaults",
42+
"WaitForOptions",
43+
"WaitForStopCondition",
44+
"Money",
45+
"Region",
46+
"Zone",
47+
"ScwFile",
48+
"ServiceInfo",
49+
"TimeSeriesPoint",
50+
"TimeSeries",
51+
]

0 commit comments

Comments
 (0)