PR comments

Author: rambleraptor

mkdocs/docs/contributing.md

@@ -159,13 +159,22 @@ To rebuild the containers from scratch.
 
 PyIceberg supports the ability to run our catalog tests against an arbitrary REST Catalog.
 
-To do so, run the catalog integration tests with the `PYICEBERG_REST_CATALOG_PROPERTIES` environment variable.
+You can set the test catalog in the ~/.pyiceberg.yaml file:
 
-```sh
-PYICEBERG_REST_CATALOG_PROPERTIES='{"uri": "http://localhost:8181"}' poetry run pytest tests/integration/
+```yaml
+catalog:
+  test_catalog:
+    uri: http://rest-catalog/ws/
+    credential: t-1234:secret
 ```
 
-`PYICEBERG_REST_CATALOG_PROPERTIES` should be a JSON-encoded string that contains any [catalog properties](https://py.iceberg.apache.org/configuration/#rest-catalog) necessary to interact with your REST Catalog implementation.
+You can additionally set the properties using environment variables
+
+```sh
+export PYICEBERG_CATALOG__TEST_CATALOG__URI=thrift://localhost:9083
+export PYICEBERG_CATALOG__TEST_CATALOG__ACCESS_KEY_ID=username
+export PYICEBERG_CATALOG__TEST_CATALOG__SECRET_ACCESS_KEY=password
+```
 
 ## Code standards
 

tests/integration/test_catalog.py

@@ -15,7 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-import json
 import os
 from pathlib import Path, PosixPath
 from typing import Generator, List
@@ -77,17 +76,13 @@ def rest_catalog() -> Generator[Catalog, None, None]:
 
 
 @pytest.fixture(scope="function")
-def rest_catalog_env() -> Generator[Catalog, None, None]:
-    if properties_json := os.environ.get("PYICEBERG_REST_CATALOG_PROPERTIES"):
-        properties = json.loads(properties_json)
-        test_catalog = RestCatalog(
-            "rest_env",
-            **properties,
-        )
+def test_catalog() -> Generator[Catalog, None, None]:
+    if test_catalog_name := os.environ.get("PYICEBERG_TEST_CATALOG"):
+        test_catalog = RestCatalog(test_catalog_name)
         yield test_catalog
         clean_up(test_catalog)
     else:
-        pytest.skip("REST catalog environment variables not set")
+        pytest.skip("Test catalog environment variables not set")
 
 
 @pytest.fixture(scope="function")
@@ -111,7 +106,7 @@ def hive_catalog() -> Generator[Catalog, None, None]:
     pytest.lazy_fixture("sqlite_catalog_file"),
     pytest.lazy_fixture("rest_catalog"),
     pytest.lazy_fixture("hive_catalog"),
-    pytest.lazy_fixture("rest_catalog_env"),
+    pytest.lazy_fixture("test_catalog"),
 ]