Skip to content

Commit 7e638a6

Browse files
authored
Merge branch 'master' into new-apify-storage-clients
2 parents dd0bf9e + 437648a commit 7e638a6

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ dev = [
6868
"dycw-pytest-only>=2.1.1",
6969
"griffe~=1.11.0",
7070
"mypy~=1.17.0",
71-
"pre-commit~=4.2.0",
71+
"pre-commit~=4.3.0",
7272
"pydoc-markdown~=4.8.0",
7373
"pytest-asyncio~=1.1.0",
7474
"pytest-cov~=6.2.0",
@@ -80,7 +80,7 @@ dev = [
8080
"setuptools", # setuptools are used by pytest but not explicitly required
8181
"types-cachetools>=6.0.0.20250525",
8282
"uvicorn[standard]",
83-
"werkzeug~=3.0.0", # Werkzeug is used by httpserver
83+
"werkzeug~=3.1.3", # Werkzeug is used by httpserver
8484
"yarl~=1.20.0", # yarl is used by crawlee
8585
]
8686

src/apify/_configuration.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,15 @@ class Configuration(CrawleeConfiguration):
367367
),
368368
] = None
369369

370+
user_is_paying: Annotated[
371+
bool,
372+
Field(
373+
alias='apify_user_is_paying',
374+
description='True if the user calling the Actor is paying user',
375+
),
376+
BeforeValidator(lambda val: False if val == '' else val),
377+
] = False
378+
370379
web_server_port: Annotated[
371380
int,
372381
Field(

tests/integration/test_crawlers_with_storages.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
from typing import TYPE_CHECKING
44

5+
import pytest
6+
57
if TYPE_CHECKING:
68
from .conftest import MakeActorFunction, RunActorFunction
79

@@ -76,6 +78,7 @@ async def default_handler(context: ParselCrawlingContext) -> None:
7678
assert run_result.status == 'SUCCEEDED'
7779

7880

81+
@pytest.mark.skip(reason='Sometimes crawler does not respect max_request_retries argument, see issue #540')
7982
async def test_actor_on_platform_max_request_retries(
8083
make_actor: MakeActorFunction,
8184
run_actor: RunActorFunction,

tests/unit/actor/test_actor_env_helpers.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ async def test_get_env_with_randomized_env_vars(monkeypatch: pytest.MonkeyPatch)
4343
ApifyEnvVars.SDK_LATEST_VERSION,
4444
ApifyEnvVars.LOG_FORMAT,
4545
ApifyEnvVars.LOG_LEVEL,
46-
ApifyEnvVars.USER_IS_PAYING,
4746
ActorEnvVars.STANDBY_PORT,
4847
ApifyEnvVars.PERSIST_STORAGE,
4948
}

uv.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)