lint changes

Author: rambleraptor

pyiceberg/catalog/rest/auth.py

@@ -17,8 +17,8 @@
 
 import base64
 import importlib
-from abc import ABC, abstractmethod
 import logging
+from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional, Type
 
 from requests import HTTPError, PreparedRequest, Session
@@ -111,9 +111,7 @@ def auth_header(self) -> str:
 
 
 class GoogleAuthManager(AuthManager):
-    """
-    An auth manager that is responsible for handling Google credentials.
-    """
+    """An auth manager that is responsible for handling Google credentials."""
 
     def __init__(self, credentials_path: Optional[str] = None, scopes: Optional[List[str]] = None):
         """
@@ -127,9 +125,7 @@ def __init__(self, credentials_path: Optional[str] = None, scopes: Optional[List
             import google.auth
             import google.auth.transport.requests
         except ImportError as e:
-            raise ImportError(
-                "Google Auth libraries not found. Please install 'google-auth'."
-            ) from e
+            raise ImportError("Google Auth libraries not found. Please install 'google-auth'.") from e
 
         if credentials_path:
             self.credentials, _ = google.auth.load_credentials_from_file(credentials_path, scopes=scopes)
@@ -142,6 +138,7 @@ def auth_header(self) -> Optional[str]:
         self.credentials.refresh(self._auth_request)
         return f"Bearer {self.credentials.token}"
 
+
 class AuthManagerAdapter(AuthBase):
     """A `requests.auth.AuthBase` adapter that integrates an `AuthManager` into a `requests.Session` to automatically attach the appropriate Authorization header to every request.
 

pyproject.toml

@@ -63,6 +63,7 @@ zstandard = ">=0.13.0,<1.0.0"
 tenacity = ">=8.2.3,<10.0.0"
 pyroaring = ">=1.0.0,<2.0.0"
 pyarrow = { version = ">=17.0.0,<21.0.0", optional = true }
+google-auth = { version = ">=2.4.0", optional = true }
 pandas = { version = ">=1.0.0,<3.0.0", optional = true }
 duckdb = { version = ">=0.5.0,<2.0.0", optional = true }
 ray = [
@@ -125,6 +126,10 @@ ignore_missing_imports = true
 module = "pyarrow.*"
 ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = "google.*"
+ignore_missing_imports = true
+
 [[tool.mypy.overrides]]
 module = "pandas.*"
 ignore_missing_imports = true
@@ -309,6 +314,7 @@ gcsfs = ["gcsfs"]
 rest-sigv4 = ["boto3"]
 hf = ["huggingface-hub"]
 pyiceberg-core = ["pyiceberg-core"]
+gcp-auth=["google-auth"]
 
 [tool.pytest.ini_options]
 markers = [

tests/catalog/test_rest_auth.py

@@ -21,6 +21,7 @@
 import pytest
 import requests
 from requests_mock import Mocker
+
 from pyiceberg.catalog.rest.auth import AuthManagerAdapter, BasicAuthManager, GoogleAuthManager, NoopAuthManager
 
 TEST_URI = "https://iceberg-test-catalog/"
@@ -36,18 +37,18 @@ def rest_mock(requests_mock: Mocker) -> Mocker:
     )
     return requests_mock
 
+
 @pytest.fixture
 def google_mock(requests_mock: Mocker) -> Mocker:
-    requests_mock.post(GOOGLE_CREDS_URI,
-                       json={"access_token": "aaaabbb"},
-                       status_code=200)
+    requests_mock.post(GOOGLE_CREDS_URI, json={"access_token": "aaaabbb"}, status_code=200)
     requests_mock.get(
         TEST_URI,
         json={},
         status_code=200,
     )
     return requests_mock
 
+
 def test_noop_auth_header(rest_mock: Mocker) -> None:
     auth_manager = NoopAuthManager()
     session = requests.Session()
@@ -77,9 +78,11 @@ def test_basic_auth_header(rest_mock: Mocker) -> None:
     assert actual_headers["Authorization"] == expected_header
 
 
-@patch('google.auth.transport.requests.Request')
-@patch('google.auth.default')
-def test_google_auth_manager_default_credentials(mock_google_auth_default: MagicMock, mock_google_request: MagicMock, rest_mock: Mocker) -> None:
+@patch("google.auth.transport.requests.Request")
+@patch("google.auth.default")
+def test_google_auth_manager_default_credentials(
+    mock_google_auth_default: MagicMock, mock_google_request: MagicMock, rest_mock: Mocker
+) -> None:
     """Test GoogleAuthManager with default application credentials."""
     mock_credentials = MagicMock()
     mock_credentials.token = "test_token"
@@ -98,9 +101,11 @@ def test_google_auth_manager_default_credentials(mock_google_auth_default: Magic
     assert actual_headers["Authorization"] == "Bearer test_token"
 
 
-@patch('google.auth.transport.requests.Request')
-@patch('google.auth.load_credentials_from_file')
-def test_google_auth_manager_with_credentials_file(mock_load_creds: MagicMock, mock_google_request: MagicMock, rest_mock: Mocker) -> None:
+@patch("google.auth.transport.requests.Request")
+@patch("google.auth.load_credentials_from_file")
+def test_google_auth_manager_with_credentials_file(
+    mock_load_creds: MagicMock, mock_google_request: MagicMock, rest_mock: Mocker
+) -> None:
     """Test GoogleAuthManager with a credentials file path."""
     mock_credentials = MagicMock()
     mock_credentials.token = "file_token"
@@ -119,9 +124,11 @@ def test_google_auth_manager_with_credentials_file(mock_load_creds: MagicMock, m
     assert actual_headers["Authorization"] == "Bearer file_token"
 
 
-@patch('google.auth.transport.requests.Request')
-@patch('google.auth.load_credentials_from_file')
-def test_google_auth_manager_with_credentials_file_and_scopes(mock_load_creds: MagicMock, mock_google_request: MagicMock, rest_mock: Mocker) -> None:
+@patch("google.auth.transport.requests.Request")
+@patch("google.auth.load_credentials_from_file")
+def test_google_auth_manager_with_credentials_file_and_scopes(
+    mock_load_creds: MagicMock, mock_google_request: MagicMock, rest_mock: Mocker
+) -> None:
     """Test GoogleAuthManager with a credentials file path and scopes."""
     mock_credentials = MagicMock()
     mock_credentials.token = "scoped_token"
@@ -143,6 +150,6 @@ def test_google_auth_manager_with_credentials_file_and_scopes(mock_load_creds: M
 
 def test_google_auth_manager_import_error() -> None:
     """Test GoogleAuthManager raises ImportError if google-auth is not installed."""
-    with patch.dict('sys.modules', {'google.auth': None, 'google.auth.transport.requests': None}):
+    with patch.dict("sys.modules", {"google.auth": None, "google.auth.transport.requests": None}):
         with pytest.raises(ImportError, match="Google Auth libraries not found. Please install 'google-auth'."):
-            GoogleAuthManager()
+            GoogleAuthManager()