Merge branch 'master' into new-apify-storage-clients

vdusek · web-flow · commit 6fe9eb37c6e3 · 2025-07-03T16:08:19.000+02:00
diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml
@@ -31,19 +31,27 @@ jobs:
   lint_check:
     name: Lint check
     uses: apify/workflows/.github/workflows/python_lint_check.yaml@main
+    with:
+      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
 
   type_check:
     name: Type check
     uses: apify/workflows/.github/workflows/python_type_check.yaml@main
+    with:
+      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
 
   unit_tests:
     name: Unit tests
     uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main
+    with:
+      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
 
   integration_tests:
     name: Integration tests
     uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main
     secrets: inherit
+    with:
+      python-versions: '["3.10", "3.13"]'
 
   update_changelog:
     name: Update changelog
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -42,19 +42,27 @@ jobs:
   lint_check:
     name: Lint check
     uses: apify/workflows/.github/workflows/python_lint_check.yaml@main
+    with:
+      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
 
   type_check:
     name: Type check
     uses: apify/workflows/.github/workflows/python_type_check.yaml@main
+    with:
+      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
 
   unit_tests:
     name: Unit tests
     uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main
+    with:
+      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
 
   integration_tests:
     name: Integration tests
     uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main
     secrets: inherit
+    with:
+      python-versions: '["3.10", "3.13"]'
 
   update_changelog:
     name: Update changelog
diff --git a/.github/workflows/run_code_checks.yaml b/.github/workflows/run_code_checks.yaml
@@ -10,14 +10,20 @@ jobs:
   lint_check:
     name: Lint check
     uses: apify/workflows/.github/workflows/python_lint_check.yaml@main
+    with:
+      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
 
   type_check:
     name: Type check
     uses: apify/workflows/.github/workflows/python_type_check.yaml@main
+    with:
+      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
 
   unit_tests:
     name: Unit tests
     uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main
+    with:
+      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
 
   docs_check:
     name: Docs check
@@ -26,5 +32,7 @@ jobs:
   integration_tests:
     name: Integration tests
     needs: [lint_check, type_check, unit_tests]
-    uses: apify/workflows/.github/workflows/python_integration_tests.yaml@fix-integration-tests-from-forks
+    uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main
     secrets: inherit
+    with:
+      python-versions: '["3.10", "3.13"]'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Here you'll find a contributing guide to get started with development.
 
 ## Environment
 
-For local development, it is required to have Python 3.9 (or a later version) installed.
+For local development, it is required to have Python 3.10 (or a later version) installed.
 
 We use [uv](https://docs.astral.sh/uv/) for project management. Install it and set up your IDE accordingly.
 
diff --git a/docs/01_overview/02_running_actors_locally.mdx b/docs/01_overview/02_running_actors_locally.mdx
@@ -11,7 +11,7 @@ In this page, you'll learn how to create and run Apify Actors locally on your co
 
 ## Requirements
 
-The Apify SDK requires Python version 3.9 or above to run Python Actors locally.
+The Apify SDK requires Python version 3.10 or above to run Python Actors locally.
 
 ## Creating your first Actor
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,13 +9,13 @@ description = "Apify SDK for Python"
 authors = [{ name = "Apify Technologies s.r.o.", email = "support@apify.com" }]
 license = { file = "LICENSE" }
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -52,27 +52,30 @@ dependencies = [
 scrapy = ["scrapy>=2.11.0"]
 
 [project.urls]
-"Homepage" = "https://docs.apify.com/sdk/python/"
-"Apify homepage" = "https://apify.com"
+"Apify Homepage" = "https://apify.com"
 "Changelog" = "https://docs.apify.com/sdk/python/docs/changelog"
-"Documentation" = "https://docs.apify.com/sdk/python/"
-"Issue tracker" = "https://github.com/apify/apify-sdk-python/issues"
-"Repository" = "https://github.com/apify/apify-sdk-python"
+"Discord" = "https://discord.com/invite/jyEM2PRvMU"
+"Documentation" = "https://docs.apify.com/sdk/python/docs/overview/introduction"
+"Homepage" = "https://docs.apify.com/sdk/python/"
+"Issue Tracker" = "https://github.com/apify/apify-sdk-python/issues"
+"Release Notes" = "https://docs.apify.com/sdk/python/docs/upgrading/upgrading-to-v2"
+"Source Code" = "https://github.com/apify/apify-sdk-python"
 
 [dependency-groups]
 dev = [
     "build~=1.2.0",
+    "dycw-pytest-only>=2.1.1",
     "griffe~=1.7.0",
     "mypy~=1.16.0",
     "pre-commit~=4.2.0",
     "pydoc-markdown~=4.8.0",
     "pytest-asyncio~=1.0.0",
     "pytest-cov~=6.2.0",
-    "pytest-only~=2.1.0",
-    "pytest-xdist~=3.7.0",
+    "pytest-timeout>=2.4.0",
+    "pytest-xdist~=3.8.0",
     "pytest~=8.4.0",
     "respx~=0.22.0",
-    "ruff~=0.11.0",
+    "ruff~=0.12.0",
     "setuptools", # setuptools are used by pytest but not explicitly required
     "types-cachetools>=6.0.0.20250525",
 ]
@@ -139,6 +142,9 @@ indent-style = "space"
     "TRY301",  # Abstract `raise` to an inner function
     "TID252",  # Prefer absolute imports over relative imports from parent modules
 ]
+"**/{tests}/{integration}/*" = [
+    "PLC0415", # `import` should be at the top-level of a file
+]
 "**/{docs,website}/**" = [
     "D",       # Everything from the pydocstyle
     "INP001",  # File {filename} is part of an implicit namespace package, add an __init__.py
@@ -186,7 +192,7 @@ asyncio_mode = "auto"
 timeout = 1200
 
 [tool.mypy]
-python_version = "3.9"
+python_version = "3.10"
 plugins = ["pydantic.mypy"]
 files = ["src", "tests", "docs", "website"]
 check_untyped_defs = true
@@ -213,7 +219,7 @@ module = [
 ignore_missing_imports = true
 
 [tool.basedpyright]
-pythonVersion = "3.9"
+pythonVersion = "3.10"
 typeCheckingMode = "standard"
 include = ["src", "tests", "docs", "website"]
 
diff --git a/src/apify/_actor.py b/src/apify/_actor.py
@@ -5,7 +5,7 @@
 import sys
 from contextlib import suppress
 from datetime import datetime, timedelta, timezone
-from typing import TYPE_CHECKING, Any, Callable, Literal, TypeVar, cast, overload
+from typing import TYPE_CHECKING, Any, Literal, TypeVar, cast, overload
 
 from lazy_object_proxy import Proxy
 from more_itertools import flatten
@@ -39,6 +39,7 @@
 
 if TYPE_CHECKING:
     import logging
+    from collections.abc import Callable
     from types import TracebackType
 
     from typing_extensions import Self
@@ -1187,7 +1188,7 @@ def _get_default_exit_process(self) -> bool:
 
         # Check if running in Scrapy by attempting to import it.
         with suppress(ImportError):
-            import scrapy  # noqa: F401
+            import scrapy  # noqa: F401 PLC0415
 
             self.log.debug('Running in Scrapy, setting default `exit_process` to False.')
             return False
diff --git a/src/apify/_charging.py b/src/apify/_charging.py
@@ -4,7 +4,7 @@
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from decimal import Decimal
-from typing import TYPE_CHECKING, Protocol, Union
+from typing import TYPE_CHECKING, Protocol
 
 from pydantic import TypeAdapter
 
@@ -23,8 +23,7 @@
 
     from apify._configuration import Configuration
 
-
-run_validator: TypeAdapter[ActorRun | None] = TypeAdapter(Union[ActorRun, None])
+run_validator = TypeAdapter[ActorRun | None](ActorRun | None)
 
 
 @docs_group('Interfaces')
@@ -216,9 +215,7 @@ def calculate_chargeable() -> dict[str, int | None]:
             PricingInfoItem(
                 price=Decimal()
                 if self._is_at_home
-                else Decimal(
-                    '1'
-                ),  # Use a nonzero price for local development so that the maximum budget can be reached,
+                else Decimal(1),  # Use a nonzero price for local development so that the maximum budget can be reached,
                 title=f"Unknown event '{event_name}'",
             ),
         )
@@ -282,7 +279,7 @@ def calculate_max_event_charge_count_within_limit(self, event_name: str) -> int
         if pricing_info is not None:
             price = pricing_info.price
         elif not self._is_at_home:
-            price = Decimal('1')  # Use a nonzero price for local development so that the maximum budget can be reached
+            price = Decimal(1)  # Use a nonzero price for local development so that the maximum budget can be reached
         else:
             price = Decimal()
 
diff --git a/src/apify/_models.py b/src/apify/_models.py
@@ -13,7 +13,7 @@
 from apify._utils import docs_group
 
 if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 
 @docs_group('Data structures')
diff --git a/src/apify/_platform_event_manager.py b/src/apify/_platform_event_manager.py
@@ -2,7 +2,7 @@
 
 import asyncio
 from datetime import datetime
-from typing import TYPE_CHECKING, Annotated, Any, Literal, Union
+from typing import TYPE_CHECKING, Annotated, Any, Literal
 
 import websockets.asyncio.client
 from pydantic import BaseModel, Discriminator, Field, TypeAdapter
@@ -113,25 +113,10 @@ class UnknownEvent(BaseModel):
     data: Annotated[dict[str, Any], Field(default_factory=dict)]
 
 
-EventMessage = Union[
-    PersistStateEvent,
-    SystemInfoEvent,
-    MigratingEvent,
-    AbortingEvent,
-    ExitEvent,
-    EventWithoutData,
-]
-
-
-event_data_adapter: TypeAdapter[EventMessage | DeprecatedEvent | UnknownEvent] = TypeAdapter(
-    Union[
-        Annotated[
-            EventMessage,
-            Discriminator('name'),
-        ],
-        DeprecatedEvent,
-        UnknownEvent,
-    ]
+EventMessage = PersistStateEvent | SystemInfoEvent | MigratingEvent | AbortingEvent | ExitEvent | EventWithoutData
+
+event_data_adapter = TypeAdapter[EventMessage | DeprecatedEvent | UnknownEvent](
+    Annotated[EventMessage, Discriminator('name')] | DeprecatedEvent | UnknownEvent
 )
 
 
diff --git a/src/apify/_utils.py b/src/apify/_utils.py
@@ -3,7 +3,10 @@
 import builtins
 import sys
 from importlib import metadata
-from typing import Callable, Literal
+from typing import TYPE_CHECKING, Literal
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
 
 
 def get_system_info() -> dict:
diff --git a/src/apify/storages/_request_list.py b/src/apify/storages/_request_list.py
@@ -4,7 +4,7 @@
 import re
 from asyncio import Task
 from functools import partial
-from typing import Annotated, Any, Union
+from typing import Annotated, Any
 
 from pydantic import BaseModel, Field, TypeAdapter
 
@@ -35,7 +35,7 @@ class _SimpleUrlInput(_RequestDetails):
     url: str
 
 
-url_input_adapter = TypeAdapter(list[Union[_RequestsFromUrlInput, _SimpleUrlInput]])
+url_input_adapter = TypeAdapter(list[_RequestsFromUrlInput | _SimpleUrlInput])
 
 
 @docs_group('Classes')
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -7,7 +7,7 @@
 import sys
 import textwrap
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Protocol
+from typing import TYPE_CHECKING, Any, Protocol
 
 import pytest
 from filelock import FileLock
@@ -21,7 +21,7 @@
 from apify._models import ActorRun
 
 if TYPE_CHECKING:
-    from collections.abc import Awaitable, Coroutine, Iterator, Mapping
+    from collections.abc import Awaitable, Callable, Coroutine, Iterator, Mapping
     from decimal import Decimal
 
     from apify_client.clients.resource_clients import ActorClientAsync
diff --git a/tests/integration/test_actor_events.py b/tests/integration/test_actor_events.py
@@ -18,11 +18,14 @@ async def test_emit_and_capture_interval_events(
     async def main() -> None:
         import os
         from datetime import datetime
-        from typing import Any, Callable
+        from typing import TYPE_CHECKING, Any
 
         from apify_shared.consts import ActorEventTypes, ApifyEnvVars
         from crawlee.events._types import Event, EventSystemInfoData
 
+        if TYPE_CHECKING:
+            from collections.abc import Callable
+
         os.environ[ApifyEnvVars.PERSIST_STATE_INTERVAL_MILLIS] = '900'
 
         was_system_info_emitted = False
diff --git a/tests/unit/actor/test_actor_lifecycle.py b/tests/unit/actor/test_actor_lifecycle.py
@@ -5,7 +5,7 @@
 import json
 import sys
 from datetime import datetime, timezone
-from typing import TYPE_CHECKING, Any, Callable, cast
+from typing import TYPE_CHECKING, Any, cast
 from unittest.mock import AsyncMock, Mock
 
 import pytest
@@ -19,6 +19,8 @@
 from apify._actor import _ActorType
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from lazy_object_proxy import Proxy
 
 
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
diff --git a/tests/unit/test_platform_event_manager.py b/tests/unit/test_platform_event_manager.py
diff --git a/uv.lock b/uv.lock
