Skip to content

Commit dfb19bf

Browse files
matsk-sinchmatsk-sinch
committed
chore: add ruff
1 parent 502b4cf commit dfb19bf

74 files changed

Lines changed: 910 additions & 429 deletions

File tree

Some content is hidden

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

.github/workflows/run-tests.yml renamed to .github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ jobs:
3737
python -m pip install --upgrade pip
3838
pip install -r requirements-dev.txt
3939
40-
- name: Lint with flake8
40+
- name: Lint and format check with Ruff
4141
run: |
42-
flake8 sinch tests --count --max-complexity=10 --max-line-length=120 --statistics
42+
ruff check sinch/domains/numbers --statistics
43+
ruff format sinch/domains/numbers --check --diff
4344
4445
- name: Test with Pytest
4546
run: |

‎pyproject.toml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,15 @@ pydantic = ">=2.0.0"
3232
[build-system]
3333
requires = ["poetry-core"]
3434
build-backend = "poetry.core.masonry.api"
35+
36+
[tool.ruff]
37+
line-length = 79
38+
target-version = "py39"
39+
extend-exclude = [
40+
"sinch/core",
41+
"tests",
42+
"venv",
43+
"__pycache__",
44+
"dist",
45+
"build"
46+
]

‎requirements-dev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ coverage
55
behave
66

77
# Code Quality
8-
flake8
8+
ruff
99

1010
# HTTP Libraries
1111
requests

‎sinch/domains/numbers/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from sinch.domains.numbers.virtual_numbers import VirtualNumbers
22

3-
__all__ = ['VirtualNumbers']
3+
__all__ = ["VirtualNumbers"]

‎sinch/domains/numbers/api/v1/__init__.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
from sinch.domains.numbers.api.v1.active_numbers_apis import ActiveNumbers
2-
from sinch.domains.numbers.api.v1.available_numbers_apis import AvailableNumbers
3-
from sinch.domains.numbers.api.v1.available_regions_apis import AvailableRegions
4-
from sinch.domains.numbers.api.v1.callback_configuration_apis import CallbackConfiguration
2+
from sinch.domains.numbers.api.v1.available_numbers_apis import (
3+
AvailableNumbers,
4+
)
5+
from sinch.domains.numbers.api.v1.available_regions_apis import (
6+
AvailableRegions,
7+
)
8+
from sinch.domains.numbers.api.v1.callback_configuration_apis import (
9+
CallbackConfiguration,
10+
)
511

612

713
__all__ = [
814
"ActiveNumbers",
915
"AvailableNumbers",
1016
"AvailableRegions",
11-
"CallbackConfiguration"
17+
"CallbackConfiguration",
1218
]

‎sinch/domains/numbers/api/v1/active_numbers_apis.py‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,29 @@
22
from sinch.core.pagination import TokenBasedPaginator, Paginator
33
from sinch.domains.numbers.api.v1.base import BaseNumbers
44
from sinch.domains.numbers.api.v1.internal import (
5-
GetNumberConfigurationEndpoint, ListActiveNumbersEndpoint, ReleaseNumberFromProjectEndpoint,
6-
UpdateNumberConfigurationEndpoint
5+
GetNumberConfigurationEndpoint,
6+
ListActiveNumbersEndpoint,
7+
ReleaseNumberFromProjectEndpoint,
8+
UpdateNumberConfigurationEndpoint,
79
)
810
from sinch.domains.numbers.models.v1.response import ActiveNumber
911

1012
from sinch.domains.numbers.models.v1.internal import (
11-
ListActiveNumbersRequest, NumberRequest, UpdateNumberConfigurationRequest
13+
ListActiveNumbersRequest,
14+
NumberRequest,
15+
UpdateNumberConfigurationRequest,
1216
)
1317
from sinch.domains.numbers.models.v1.types import (
14-
CapabilityType, NumberSearchPatternType, NumberType, OrderByType,
15-
SmsConfigurationDict, VoiceConfigurationDict
18+
CapabilityType,
19+
NumberSearchPatternType,
20+
NumberType,
21+
OrderByType,
22+
SmsConfigurationDict,
23+
VoiceConfigurationDict,
1624
)
1725

1826

1927
class ActiveNumbers(BaseNumbers):
20-
2128
def list(
2229
self,
2330
region_code: str,
@@ -28,7 +35,7 @@ def list(
2835
page_size: Optional[int] = None,
2936
page_token: Optional[str] = None,
3037
order_by: Optional[OrderByType] = None,
31-
**kwargs
38+
**kwargs,
3239
) -> Paginator[ActiveNumber]:
3340
return TokenBasedPaginator(
3441
sinch=self._sinch,
@@ -43,9 +50,9 @@ def list(
4350
number_search_pattern=number_search_pattern,
4451
page_token=page_token,
4552
order_by=order_by,
46-
**kwargs
47-
)
48-
)
53+
**kwargs,
54+
),
55+
),
4956
)
5057

5158
def update(
@@ -55,36 +62,22 @@ def update(
5562
sms_configuration: Optional[SmsConfigurationDict] = None,
5663
voice_configuration: Optional[VoiceConfigurationDict] = None,
5764
callback_url: Optional[str] = None,
58-
**kwargs
65+
**kwargs,
5966
) -> ActiveNumber:
6067
request_data = UpdateNumberConfigurationRequest(
6168
phone_number=phone_number,
6269
display_name=display_name,
6370
sms_configuration=sms_configuration,
6471
voice_configuration=voice_configuration,
6572
callback_url=callback_url,
66-
**kwargs
73+
**kwargs,
6774
)
6875
return self._request(UpdateNumberConfigurationEndpoint, request_data)
6976

70-
def get(
71-
self,
72-
phone_number: str,
73-
**kwargs
74-
) -> ActiveNumber:
75-
request_data = NumberRequest(
76-
phone_number=phone_number,
77-
**kwargs
78-
)
77+
def get(self, phone_number: str, **kwargs) -> ActiveNumber:
78+
request_data = NumberRequest(phone_number=phone_number, **kwargs)
7979
return self._request(GetNumberConfigurationEndpoint, request_data)
8080

81-
def release(
82-
self,
83-
phone_number: str,
84-
**kwargs
85-
) -> ActiveNumber:
86-
request_data = NumberRequest(
87-
phone_number=phone_number,
88-
**kwargs
89-
)
81+
def release(self, phone_number: str, **kwargs) -> ActiveNumber:
82+
request_data = NumberRequest(phone_number=phone_number, **kwargs)
9083
return self._request(ReleaseNumberFromProjectEndpoint, request_data)

‎sinch/domains/numbers/api/v1/available_numbers_apis.py‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,36 @@
22

33
from sinch.core.pagination import Paginator, TokenBasedPaginator
44
from sinch.domains.numbers.models.v1.response import (
5-
ActiveNumber, AvailableNumber
5+
ActiveNumber,
6+
AvailableNumber,
67
)
78
from sinch.domains.numbers.api.v1.base import BaseNumbers
89
from sinch.domains.numbers.api.v1.internal import (
9-
AvailableNumbersEndpoint, RentAnyNumberEndpoint, RentNumberEndpoint, SearchForNumberEndpoint
10+
AvailableNumbersEndpoint,
11+
RentAnyNumberEndpoint,
12+
RentNumberEndpoint,
13+
SearchForNumberEndpoint,
1014
)
1115
from sinch.domains.numbers.models.v1.internal import (
12-
ListAvailableNumbersRequest, NumberRequest, RentAnyNumberRequest, RentNumberRequest
16+
ListAvailableNumbersRequest,
17+
NumberRequest,
18+
RentAnyNumberRequest,
19+
RentNumberRequest,
1320
)
1421
from sinch.domains.numbers.models.v1.types import (
15-
CapabilityType, NumberPatternDict, NumberSearchPatternType,
16-
NumberType, SmsConfigurationDict, VoiceConfigurationDict
22+
CapabilityType,
23+
NumberPatternDict,
24+
NumberSearchPatternType,
25+
NumberType,
26+
SmsConfigurationDict,
27+
VoiceConfigurationDict,
1728
)
1829

1930

2031
class AvailableNumbers(BaseNumbers):
21-
22-
def check_availability(self, phone_number: str, **kwargs) -> AvailableNumber:
32+
def check_availability(
33+
self, phone_number: str, **kwargs
34+
) -> AvailableNumber:
2335
request_data = NumberRequest(phone_number=phone_number, **kwargs)
2436
return self._request(SearchForNumberEndpoint, request_data)
2537

@@ -31,7 +43,7 @@ def search_for_available_numbers(
3143
number_search_pattern: Optional[NumberSearchPatternType] = None,
3244
capabilities: Optional[List[CapabilityType]] = None,
3345
page_size: Optional[int] = None,
34-
**kwargs
46+
**kwargs,
3547
) -> Paginator[AvailableNumber]:
3648
return TokenBasedPaginator(
3749
sinch=self._sinch,
@@ -44,9 +56,9 @@ def search_for_available_numbers(
4456
capabilities=capabilities,
4557
number_pattern=number_pattern,
4658
number_search_pattern=number_search_pattern,
47-
**kwargs
48-
)
49-
)
59+
**kwargs,
60+
),
61+
),
5062
)
5163

5264
def rent(
@@ -55,14 +67,14 @@ def rent(
5567
sms_configuration: Optional[SmsConfigurationDict] = None,
5668
voice_configuration: Optional[VoiceConfigurationDict] = None,
5769
callback_url: Optional[str] = None,
58-
**kwargs
70+
**kwargs,
5971
) -> ActiveNumber:
6072
request_data = RentNumberRequest(
6173
phone_number=phone_number,
6274
sms_configuration=sms_configuration,
6375
voice_configuration=voice_configuration,
6476
callback_url=callback_url,
65-
**kwargs
77+
**kwargs,
6678
)
6779
return self._request(RentNumberEndpoint, request_data)
6880

@@ -75,7 +87,7 @@ def rent_any(
7587
sms_configuration: Optional[SmsConfigurationDict] = None,
7688
voice_configuration: Optional[VoiceConfigurationDict] = None,
7789
callback_url: Optional[str] = None,
78-
**kwargs
90+
**kwargs,
7991
) -> ActiveNumber:
8092
request_data = RentAnyNumberRequest(
8193
region_code=region_code,
@@ -85,6 +97,6 @@ def rent_any(
8597
sms_configuration=sms_configuration,
8698
voice_configuration=voice_configuration,
8799
callback_url=callback_url,
88-
**kwargs
100+
**kwargs,
89101
)
90102
return self._request(RentAnyNumberEndpoint, request_data)

‎sinch/domains/numbers/api/v1/available_regions_apis.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
from typing import Optional, List
22
from sinch.core.pagination import TokenBasedPaginator, Paginator
33
from sinch.domains.numbers.api.v1.internal import ListAvailableRegionsEndpoint
4-
from sinch.domains.numbers.models.v1.internal import ListAvailableRegionsRequest
4+
from sinch.domains.numbers.models.v1.internal import (
5+
ListAvailableRegionsRequest,
6+
)
57
from sinch.domains.numbers.models.v1.response import AvailableRegion
68
from sinch.domains.numbers.models.v1.types import NumberType
79

@@ -11,9 +13,7 @@ def __init__(self, sinch):
1113
self._sinch = sinch
1214

1315
def list(
14-
self,
15-
types: Optional[List[NumberType]] = None,
16-
**kwargs
16+
self, types: Optional[List[NumberType]] = None, **kwargs
1717
) -> Paginator[AvailableRegion]:
1818
"""
1919
Lists all regions for numbers provided using the project ID.
@@ -36,8 +36,7 @@ def list(
3636
endpoint=ListAvailableRegionsEndpoint(
3737
project_id=self._sinch.configuration.project_id,
3838
request_data=ListAvailableRegionsRequest(
39-
types=types,
40-
**kwargs
41-
)
42-
)
39+
types=types, **kwargs
40+
),
41+
),
4342
)

‎sinch/domains/numbers/api/v1/base/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from sinch.domains.numbers.api.v1.base.base_numbers import BaseNumbers
22

3-
__all__ = ['BaseNumbers']
3+
__all__ = ["BaseNumbers"]

‎sinch/domains/numbers/api/v1/base/base_numbers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ def _request(self, endpoint_class, request_data):
1818
return self._sinch.configuration.transport.request(
1919
endpoint_class(
2020
project_id=self._sinch.configuration.project_id,
21-
request_data=request_data
21+
request_data=request_data,
2222
)
2323
)

0 commit comments

Comments
 (0)