Skip to content

Commit b78e54c

Browse files
authored
Fix GitHub Actions workflow triggers for li-0.11 branch (#43)
* 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. * 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.
1 parent 8dee48a commit b78e54c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.github/workflows/check-md-link.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
- '.github/workflows/check-md-link.yml'
2626
- 'mkdocs/**'
2727
branches:
28-
- 'main'
28+
- 'li-0.11'
2929
pull_request:
3030
paths:
3131
- '.github/workflows/check-md-link.yml'

.github/workflows/python-ci-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ name: "Python CI Docs"
2222
on:
2323
push:
2424
branches:
25-
- 'main'
25+
- 'li-0.11'
2626
pull_request:
2727

2828

.github/workflows/python-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ name: "Python CI"
2222
on:
2323
push:
2424
branches:
25-
- 'main'
25+
- 'li-0.11'
2626
pull_request:
2727
paths:
2828
- '**' # Include all files and directories in the repository by default.

tests/catalog/test_hive.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1314,8 +1314,8 @@ def test_hive_wait_for_lock() -> None:
13141314
assert catalog._client.check_lock.call_count == 3
13151315

13161316
# lock wait should exit with WaitingForLockException finally after enough retries
1317+
catalog._client.check_lock.reset_mock()
13171318
catalog._client.check_lock.side_effect = [waiting for _ in range(10)]
1318-
catalog._client.check_lock.call_count = 0
13191319
with pytest.raises(WaitingForLockException):
13201320
catalog._wait_for_lock("db", "tbl", lockid, catalog._client)
13211321
assert catalog._client.check_lock.call_count == 5

0 commit comments

Comments
 (0)