temp

Author: jx2lee

pyiceberg/catalog/__init__.py

@@ -226,7 +226,9 @@ def _check_required_catalog_properties(name: str, catalog_type: CatalogType, con
         )
 
 
-def load_catalog(name: str | None = None, config: Config | None = None, **properties: str | None) -> Catalog:
+def load_catalog(
+    name: str | None = None, config: Config | dict[str, str | None] | None = None, **properties: str | None
+) -> Catalog:
     """Load the catalog based on the properties.
 
     Will look up the properties from the config, based on the name.
@@ -242,6 +244,10 @@ def load_catalog(name: str | None = None, config: Config | None = None, **proper
         ValueError: Raises a ValueError in case properties are missing or malformed,
             or if it could not determine the catalog based on the properties.
     """
+    if isinstance(config, dict):
+        properties = {**config, **properties}
+        config = None
+
     config = config or get_env_config()
     if name is None:
         name = config.get_default_catalog_name()

tests/catalog/test_rest.py

@@ -2036,16 +2036,18 @@ def test_catalog_from_environment_variables(catalog_config_mock: mock.Mock, rest
 
 
 @mock.patch.dict(os.environ, EXAMPLE_ENV)
-@mock.patch("pyiceberg.catalog._ENV_CONFIG.get_catalog_config")
-def test_catalog_from_environment_variables_override(catalog_config_mock: mock.Mock, rest_mock: Mocker) -> None:
+@mock.patch("pyiceberg.catalog.get_env_config")
+def test_catalog_from_environment_variables_override(get_env_config_mock: mock.Mock, rest_mock: Mocker) -> None:
     rest_mock.get(
         "https://other-service.io/api/v1/config",
         json={"defaults": {}, "overrides": {}},
         status_code=200,
     )
     env_config: RecursiveDict = Config._from_environment_variables({})
 
-    catalog_config_mock.return_value = cast(RecursiveDict, env_config.get("catalog")).get("production")
+    mock_env_config = mock.Mock()
+    mock_env_config.get_catalog_config.return_value = cast(RecursiveDict, env_config.get("catalog")).get("production")
+    get_env_config_mock.return_value = mock_env_config
     catalog = cast(RestCatalog, load_catalog("production", uri="https://other-service.io/api"))
     assert catalog.uri == "https://other-service.io/api"
 

tests/cli/test_console.py

@@ -50,7 +50,7 @@ def test_missing_uri(mocker: MockFixture, empty_home_dir_path: str) -> None:
 def test_hive_catalog_missing_uri_shows_helpful_error(mocker: MockFixture) -> None:
     mock_env_config = mocker.MagicMock()
     mock_env_config.get_catalog_config.return_value = {"type": "hive"}
-    mocker.patch("pyiceberg.catalog._ENV_CONFIG", mock_env_config)
+    mocker.patch("pyiceberg.catalog.get_env_config", return_value=mock_env_config)
 
     runner = CliRunner()
     result = runner.invoke(run, ["--catalog", "my_hive_catalog", "list"])

tests/conftest.py

@@ -40,7 +40,6 @@
     TYPE_CHECKING,
     Any,
 )
-from unittest import mock
 
 import boto3
 import pytest
@@ -111,20 +110,6 @@ def pytest_collection_modifyitems(items: list[pytest.Item]) -> None:
             item.add_marker("unmarked")
 
 
-@pytest.fixture(autouse=True, scope="session")
-def _isolate_pyiceberg_config() -> None:
-    """Make test runs ignore your local PyIceberg config.
-
-    Without this, tests will attempt to resolve a local ~/.pyiceberg.yaml while running pytest.
-    This replaces the global catalog config once at session start with an env-only config.
-    """
-    import pyiceberg.catalog as _catalog_module
-    from pyiceberg.utils.config import Config
-
-    with mock.patch.object(Config, "_from_configuration_files", return_value=None):
-        _catalog_module._ENV_CONFIG = Config()
-
-
 def pytest_addoption(parser: pytest.Parser) -> None:
     # S3 options
     parser.addoption(

tests/utils/test_config.py

@@ -71,7 +71,8 @@ def test_from_configuration_files(tmp_path_factory: pytest.TempPathFactory) -> N
         file.write(yaml_str)
 
     os.environ["PYICEBERG_HOME"] = config_path
-    assert Config().get_catalog_config("production") == {"uri": "https://service.io/api"}
+    config = Config()
+    assert config.get_catalog_config("production") == {"uri": "https://service.io/api"}
 
 
 def test_lowercase_dictionary_keys() -> None: