Skip to content

Commit df224f7

Browse files
committed
Merge remote-tracking branch 'origin/master' into docs/fix-broken-links
# Conflicts: # website/package.json # website/versioned_docs/version-3.0/api-typedoc.json
2 parents 72ea0d6 + 4afa352 commit df224f7

15 files changed

Lines changed: 63168 additions & 62549 deletions

File tree

.github/workflows/_checks.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@v6
27+
uses: actions/checkout@v7
2828
- name: Run actionlint
2929
uses: rhysd/actionlint@v1.7.12
3030

@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434
steps:
3535
- name: Checkout repository
36-
uses: actions/checkout@v6
36+
uses: actions/checkout@v7
3737
- name: Check spelling with typos
3838
uses: crate-ci/typos@v1
3939

@@ -54,7 +54,7 @@ jobs:
5454
runs-on: ubuntu-latest
5555
steps:
5656
- name: Checkout repository
57-
uses: actions/checkout@v6
57+
uses: actions/checkout@v7
5858

5959
- name: Set up Python
6060
uses: actions/setup-python@v6
@@ -110,7 +110,7 @@ jobs:
110110

111111
steps:
112112
- name: Checkout repository
113-
uses: actions/checkout@v6
113+
uses: actions/checkout@v7
114114

115115
- name: Set up Python ${{ matrix.python-version }}
116116
uses: actions/setup-python@v6
@@ -149,7 +149,7 @@ jobs:
149149
runs-on: ubuntu-latest
150150
steps:
151151
- name: Checkout repository
152-
uses: actions/checkout@v6
152+
uses: actions/checkout@v7
153153

154154
- name: Set up uv package manager
155155
uses: astral-sh/setup-uv@v8.2.0

.github/workflows/manual_regenerate_models.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
fi
6060
6161
- name: Checkout apify-client-python
62-
uses: actions/checkout@v6
62+
uses: actions/checkout@v7
6363
with:
6464
token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
6565

.github/workflows/manual_release_docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
check-regexp: '^Checks'
5050

5151
- name: Checkout repository
52-
uses: actions/checkout@v6
52+
uses: actions/checkout@v7
5353
with:
5454
ref: ${{ inputs.ref }}
5555
token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}

.github/workflows/manual_version_docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
check-regexp: '^Checks'
5050

5151
- name: Checkout repository
52-
uses: actions/checkout@v6
52+
uses: actions/checkout@v7
5353
with:
5454
token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
5555

CHANGELOG.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
<!-- git-cliff-unreleased-start -->
6-
## 3.0.3 - **not yet released**
5+
## [3.0.3](https://github.com/apify/apify-client-python/releases/tag/v3.0.3) (2026-06-18)
76

87
### 🐛 Bug Fixes
98

109
- Include all supported fields for ad-hoc webhooks ([#855](https://github.com/apify/apify-client-python/pull/855)) ([6eb267d](https://github.com/apify/apify-client-python/commit/6eb267dbe620cb9d864c2390a84dfeb851cecc7c)) by [@apify-service-account](https://github.com/apify-service-account)
10+
- Only log any error that happens during log redirection ([#866](https://github.com/apify/apify-client-python/pull/866)) ([a2cc987](https://github.com/apify/apify-client-python/commit/a2cc987b6d1ef1d06b37a179876b12ee4f739f5f)) by [@Pijukatel](https://github.com/Pijukatel), closes [#864](https://github.com/apify/apify-client-python/issues/864)
1111

1212

13-
<!-- git-cliff-unreleased-end -->
1413
## [3.0.2](https://github.com/apify/apify-client-python/releases/tag/v3.0.2) (2026-05-26)
1514

1615
### 🐛 Bug Fixes

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ classifiers = [
2525
keywords = ["apify", "api", "client", "automation", "crawling", "scraping"]
2626
dependencies = [
2727
"colorama>=0.4.0",
28-
"impit>=0.9.2",
28+
"impit~=0.12.0",
2929
"more_itertools>=10.0.0",
3030
"pydantic[email]>=2.11.0",
3131
]

renovate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"lockFileMaintenance": {
99
"enabled": true,
1010
"automerge": true,
11-
"automergeType": "branch"
11+
"automergeType": "pr"
1212
},
1313
"packageRules": [
1414
{
@@ -18,7 +18,7 @@
1818
"groupName": "major/minor dev dependencies",
1919
"groupSlug": "dev-dependencies",
2020
"automerge": true,
21-
"automergeType": "branch"
21+
"automergeType": "pr"
2222
},
2323
{
2424
"matchPackageNames": ["@apify/*", "@crawlee/*", "apify", "apify-client", "apify-shared", "apify-fingerprint-datapoints", "crawlee", "got-scraping"],

src/apify_client/_streamed_log.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,16 @@ async def __aexit__(
215215
await self.stop()
216216

217217
async def _stream_log(self) -> None:
218-
async with self._log_client.stream(raw=True) as log_stream:
219-
if not log_stream:
220-
return
221-
try:
222-
async for data in log_stream.aiter_bytes():
223-
self._process_new_data(data)
224-
finally:
225-
# Flush the last buffered part even if the task is cancelled by `stop()`.
226-
self._log_buffer_content(include_last_part=True)
218+
try:
219+
async with self._log_client.stream(raw=True) as log_stream:
220+
if not log_stream:
221+
return
222+
try:
223+
async for data in log_stream.aiter_bytes():
224+
self._process_new_data(data)
225+
finally:
226+
# Flush the last buffered part even if the task is cancelled by `stop()`.
227+
self._log_buffer_content(include_last_part=True)
228+
except Exception:
229+
# Exception in log redirection should not propagate further.
230+
self._to_logger.exception('Log redirection stopped due to unexpected error:')

tests/_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ async def poll_until_condition(
134134
fn: Callable[[], Awaitable[T] | T],
135135
condition: Callable[[T], bool] = bool,
136136
*,
137-
timeout: float = 5,
137+
timeout: float = 30,
138138
poll_interval: float = 1,
139139
backoff_factor: float = 1,
140140
) -> T:

tests/integration/test_request_queue.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ async def all_locks_visible() -> bool:
526526
assert isinstance(head, RequestQueueHead)
527527
return locked_ids.isdisjoint(item.id for item in head.items)
528528

529-
await poll_until_condition(all_locks_visible, timeout=30, poll_interval=1)
529+
await poll_until_condition(all_locks_visible)
530530

531531
# Unlock all requests
532532
unlock_response = await maybe_await(rq_client.unlock_requests())

0 commit comments

Comments
 (0)