Merge pull request #24 from GetStream/ruff

Use ruff instead of black
GetStream · Apr 25, 2024 · be3d334 · be3d334
2 parents 0616713 + 0aaf83d
commit be3d334
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 120 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,6 +21,8 @@ jobs:
     steps:
     - name: Check out repo
       uses: actions/checkout@v4
+    - uses: chartboost/ruff-action@v1
+      continue-on-error: false
     - name: Install poetry
       run: pipx install poetry
     - name: Set up Python ${{ matrix.python-version }}
@@ -30,9 +32,6 @@ jobs:
         cache: 'poetry'
     - name: Install deps
       run: poetry install
-    - name: Black
-      run: poetry run black getstream/ tests/
-      continue-on-error: false
     - name: Run tests
       env:
         STREAM_BASE_URL: ${{ vars.STREAM_BASE_URL }}

diff --git a/README.md b/README.md
@@ -120,7 +120,7 @@ poetry run pytest tests/ getstream/
 Before pushing changes make sure to run the linter:
 
 ```sh
-poetry run black getstream/ tests/
+poetry run ruff format getstream/ tests/
 ```
 
 ## License

diff --git a/getstream/chat/rest_client.py b/getstream/chat/rest_client.py
@@ -5,7 +5,6 @@
 
 
 class ChatRestClient(BaseClient):
-
     def __init__(self, api_key: str, base_url: str, timeout: float, token: str):
         """
         Initializes ChatClient with BaseClient instance
@@ -22,7 +21,6 @@ def __init__(self, api_key: str, base_url: str, timeout: float, token: str):
         )
 
     def list_block_lists(self) -> StreamResponse[ListBlockListResponse]:
-
         return self.get("/api/v2/chat/blocklists", ListBlockListResponse)
 
     def create_block_list(
@@ -524,7 +522,6 @@ def mark_unread(
         )
 
     def list_channel_types(self) -> StreamResponse[ListChannelTypesResponse]:
-
         return self.get("/api/v2/chat/channeltypes", ListChannelTypesResponse)
 
     def create_channel_type(
@@ -673,7 +670,6 @@ def update_channel_type(
         )
 
     def list_commands(self) -> StreamResponse[ListCommandsResponse]:
-
         return self.get("/api/v2/chat/commands", ListCommandsResponse)
 
     def create_command(
@@ -1493,7 +1489,6 @@ def update_thread_partial(
         )
 
     def unread_counts(self) -> StreamResponse[WrappedUnreadCountsResponse]:
-
         return self.get("/api/v2/chat/unread", WrappedUnreadCountsResponse)
 
     def unread_counts_batch(

diff --git a/getstream/common/rest_client.py b/getstream/common/rest_client.py
@@ -5,7 +5,6 @@
 
 
 class CommonRestClient(BaseClient):
-
     def __init__(self, api_key: str, base_url: str, timeout: float, token: str):
         """
         Initializes CommonClient with BaseClient instance
@@ -22,7 +21,6 @@ def __init__(self, api_key: str, base_url: str, timeout: float, token: str):
         )
 
     def get_app(self) -> StreamResponse[GetApplicationResponse]:
-
         return self.get("/api/v2/app", GetApplicationResponse)
 
     def update_app(
@@ -215,7 +213,6 @@ def create_import_url(
         return self.post("/api/v2/import_urls", CreateImportURLResponse, json=json)
 
     def list_imports(self) -> StreamResponse[ListImportsResponse]:
-
         return self.get("/api/v2/imports", ListImportsResponse)
 
     def create_import(
@@ -240,7 +237,6 @@ def get_og(self, url: str) -> StreamResponse[GetOGResponse]:
         return self.get("/api/v2/og", GetOGResponse, query_params=query_params)
 
     def list_permissions(self) -> StreamResponse[ListPermissionsResponse]:
-
         return self.get("/api/v2/permissions", ListPermissionsResponse)
 
     def get_permission(self, id: str) -> StreamResponse[GetCustomPermissionResponse]:
@@ -255,7 +251,6 @@ def get_permission(self, id: str) -> StreamResponse[GetCustomPermissionResponse]
         )
 
     def list_push_providers(self) -> StreamResponse[ListPushProvidersResponse]:
-
         return self.get("/api/v2/push_providers", ListPushProvidersResponse)
 
     def upsert_push_provider(
@@ -298,7 +293,6 @@ def get_rate_limits(
         )
 
     def list_roles(self) -> StreamResponse[ListRolesResponse]:
-
         return self.get("/api/v2/roles", ListRolesResponse)
 
     def create_role(self, name: str) -> StreamResponse[CreateRoleResponse]:

diff --git a/getstream/video/call.py b/getstream/video/call.py
@@ -3,7 +3,6 @@
 
 
 class Call:
-
     def __init__(
         self, client, call_type: str, call_id: str = None, custom_data: Dict = None
     ):

diff --git a/getstream/video/rest_client.py b/getstream/video/rest_client.py
@@ -5,7 +5,6 @@
 
 
 class VideoRestClient(BaseClient):
-
     def __init__(self, api_key: str, base_url: str, timeout: float, token: str):
         """
         Initializes VideoClient with BaseClient instance
@@ -538,7 +537,6 @@ def query_calls(
         )
 
     def list_call_types(self) -> StreamResponse[ListCallTypeResponse]:
-
         return self.get("/api/v2/video/calltypes", ListCallTypeResponse)
 
     def create_call_type(
@@ -605,11 +603,9 @@ def update_call_type(
         )
 
     def get_edges(self) -> StreamResponse[GetEdgesResponse]:
-
         return self.get("/api/v2/video/edges", GetEdgesResponse)
 
     def list_external_storage(self) -> StreamResponse[ListExternalStorageResponse]:
-
         return self.get("/api/v2/video/external_storage", ListExternalStorageResponse)
 
     def create_external_storage(

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,8 +25,11 @@ flake8 = "^6.0.0"
 
 [tool.poetry.group.dev-dependencies.dependencies]
 python-dotenv = "^1.0.1"
-black = "^24.4.0"
+ruff = "^0.4.1"
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.ruff.lint]
+ignore = ["F405", "F403"]
diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -208,20 +208,22 @@ def test_custom_recording_style_css(self, client: Stream):
         )
 
     def test_custom_recording_website(self, client: Stream):
-        client.video.update_call_type(
-            CALL_TYPE_NAME,
-            settings=CallSettingsRequest(
-                recording=RecordSettingsRequest(
-                    mode="available",
-                    audio_only=False,
-                    quality="1080p",
-                    layout=LayoutSettingsRequest(
-                        name="custom",
-                        external_app_url="https://path/to/layout/app",
+        (
+            client.video.update_call_type(
+                CALL_TYPE_NAME,
+                settings=CallSettingsRequest(
+                    recording=RecordSettingsRequest(
+                        mode="available",
+                        audio_only=False,
+                        quality="1080p",
+                        layout=LayoutSettingsRequest(
+                            name="custom",
+                            external_app_url="https://path/to/layout/app",
+                        ),
                     ),
                 ),
             ),
-        ),
+        )
 
     def test_delete_call_type(self, client: Stream):
         try:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     class Call:
         def __init__(
             self, client, call_type: str, call_id: str = None, custom_data: Dict = None
         ):
@@ Expand Down @@