From c1457aa5fcdb3f11097a7f9aac3696e129580cd5 Mon Sep 17 00:00:00 2001 From: Rob Reeves Date: Thu, 2 Apr 2026 23:30:20 +0000 Subject: [PATCH 1/2] Update GitHub Actions workflow triggers to use li-0.11 branch Replace 'main' with 'li-0.11' in push branch triggers since li-0.11 is the default branch for this fork and main does not exist. --- .github/workflows/check-md-link.yml | 2 +- .github/workflows/python-ci-docs.yml | 2 +- .github/workflows/python-ci.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-md-link.yml b/.github/workflows/check-md-link.yml index 6bb71e1d..2924411e 100644 --- a/.github/workflows/check-md-link.yml +++ b/.github/workflows/check-md-link.yml @@ -25,7 +25,7 @@ on: - '.github/workflows/check-md-link.yml' - 'mkdocs/**' branches: - - 'main' + - 'li-0.11' pull_request: paths: - '.github/workflows/check-md-link.yml' diff --git a/.github/workflows/python-ci-docs.yml b/.github/workflows/python-ci-docs.yml index 6b3fc7f4..718788f4 100644 --- a/.github/workflows/python-ci-docs.yml +++ b/.github/workflows/python-ci-docs.yml @@ -22,7 +22,7 @@ name: "Python CI Docs" on: push: branches: - - 'main' + - 'li-0.11' pull_request: diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index eb3f7265..25a1b713 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -22,7 +22,7 @@ name: "Python CI" on: push: branches: - - 'main' + - 'li-0.11' pull_request: paths: - '**' # Include all files and directories in the repository by default. From c100476b2544c8b2d927dc10291ecaf632e277f5 Mon Sep 17 00:00:00 2001 From: Rob Reeves Date: Fri, 3 Apr 2026 04:06:58 +0000 Subject: [PATCH 2/2] Backport fix for Hive catalog test failure on CPython 3.13.12 Cherry-pick of apache/iceberg-python#3043. Use reset_mock() instead of directly assigning call_count = 0, which no longer works on CPython 3.13.12. --- tests/catalog/test_hive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/catalog/test_hive.py b/tests/catalog/test_hive.py index 88b653e4..a8c0c943 100644 --- a/tests/catalog/test_hive.py +++ b/tests/catalog/test_hive.py @@ -1314,8 +1314,8 @@ def test_hive_wait_for_lock() -> None: assert catalog._client.check_lock.call_count == 3 # lock wait should exit with WaitingForLockException finally after enough retries + catalog._client.check_lock.reset_mock() catalog._client.check_lock.side_effect = [waiting for _ in range(10)] - catalog._client.check_lock.call_count = 0 with pytest.raises(WaitingForLockException): catalog._wait_for_lock("db", "tbl", lockid, catalog._client) assert catalog._client.check_lock.call_count == 5