Merge branch 'master' into feat/sign-public-url

Author: danpoletaev

.github/workflows/build_and_deploy_docs.yaml

@@ -8,7 +8,7 @@ on:
 
 env:
   NODE_VERSION: 22
-  PYTHON_VERSION: 3.12
+  PYTHON_VERSION: 3.13
 
 jobs:
   build_and_deploy_docs:
@@ -54,10 +54,13 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
+      - name: Set up uv package manager
+        uses: astral-sh/setup-uv@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+
       - name: Install Python dependencies
-        run: |
-          pipx install --python ${{ env.PYTHON_VERSION }} poetry
-          make install-dev
+        run: make install-dev
 
       - name: Build generated API reference
         run: make build-api-reference

.github/workflows/release.yaml

@@ -25,7 +25,7 @@ jobs:
   release_metadata:
     name: Prepare release metadata
     runs-on: ubuntu-latest
-    outputs: 
+    outputs:
       version_number: ${{ steps.release_metadata.outputs.version_number }}
       tag_name: ${{ steps.release_metadata.outputs.tag_name }}
       changelog: ${{ steps.release_metadata.outputs.changelog }}
@@ -63,7 +63,7 @@ jobs:
     with:
       version_number: ${{ needs.release_metadata.outputs.version_number }}
       changelog: ${{ needs.release_metadata.outputs.changelog }}
-    secrets: 
+    secrets:
       APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
 
   create_github_release:
@@ -94,7 +94,7 @@ jobs:
     steps:
       - name: Prepare distribution
         uses: apify/workflows/prepare-pypi-distribution@main
-        with: 
+        with:
           package_name: apify
           is_prerelease: ""
           version_number: ${{ needs.release_metadata.outputs.version_number }}

.gitignore

@@ -10,9 +10,6 @@ __pycache__
 .envrc
 .python-version
 
-# Poetry
-poetry.toml
-
 # Mise
 mise.toml
 .mise.toml

CHANGELOG.md

@@ -2,21 +2,27 @@
 
 All notable changes to this project will be documented in this file.
 
-<!-- git-cliff-unreleased-start -->
-## 2.3.0 - **not yet released**
+## [2.3.1](https://github.com/apify/apify-sdk-python/releases/tag/v2.3.1) (2025-02-25)
+
+### 🐛 Bug Fixes
+
+- Allow None value in &#x27;inputBodyLen&#x27; in ActorRunStats ([#413](https://github.com/apify/apify-sdk-python/pull/413)) ([1cf37f1](https://github.com/apify/apify-sdk-python/commit/1cf37f13f8db1313ac82276d13200af4aa2bf773)) by [@janbuchar](https://github.com/janbuchar)
+
+
+## [2.3.0](https://github.com/apify/apify-sdk-python/releases/tag/v2.3.0) (2025-02-19)
 
 ### 🚀 Features
 
 - Add `rate_limit_errors` property for `ApifyStorageClient` ([#387](https://github.com/apify/apify-sdk-python/pull/387)) ([89c230a](https://github.com/apify/apify-sdk-python/commit/89c230a21a1a8698159975f97c73a724b9063278)) by [@Mantisus](https://github.com/Mantisus), closes [#318](https://github.com/apify/apify-sdk-python/issues/318)
 - Unify Apify and Scrapy to use single event loop &amp; remove `nest-asyncio` ([#390](https://github.com/apify/apify-sdk-python/pull/390)) ([96949be](https://github.com/apify/apify-sdk-python/commit/96949be4f7687ac9285992d1fb02ac6172307bdb)) by [@vdusek](https://github.com/vdusek), closes [#148](https://github.com/apify/apify-sdk-python/issues/148), [#176](https://github.com/apify/apify-sdk-python/issues/176), [#392](https://github.com/apify/apify-sdk-python/issues/392)
+- Support pay-per-event via `Actor.charge` ([#393](https://github.com/apify/apify-sdk-python/pull/393)) ([78888c4](https://github.com/apify/apify-sdk-python/commit/78888c4d6258211cdbc5fd5b5cbadbf23c39d818)) by [@janbuchar](https://github.com/janbuchar), closes [#374](https://github.com/apify/apify-sdk-python/issues/374)
 
 ### 🐛 Bug Fixes
 
 - Fix RQ usage in Scrapy scheduler ([#385](https://github.com/apify/apify-sdk-python/pull/385)) ([3363478](https://github.com/apify/apify-sdk-python/commit/3363478dbf6eb35e45c237546fe0df5c104166f6)) by [@vdusek](https://github.com/vdusek)
 - Make sure that Actor instances with non-default configurations are also accessible through the global Actor proxy after initialization ([#402](https://github.com/apify/apify-sdk-python/pull/402)) ([b956a02](https://github.com/apify/apify-sdk-python/commit/b956a02d0ba59e0cfde489cc13ca92d7f8f8c84f)) by [@janbuchar](https://github.com/janbuchar), closes [#397](https://github.com/apify/apify-sdk-python/issues/397)
 
 
-<!-- git-cliff-unreleased-end -->
 ## [2.2.1](https://github.com/apify/apify-sdk-python/releases/tag/v2.2.1) (2025-01-17)
 
 ### 🐛 Bug Fixes

CONTRIBUTING.md

@@ -6,7 +6,7 @@ Here you'll find a contributing guide to get started with development.
 
 For local development, it is required to have Python 3.9 (or a later version) installed.
 
-We use [Poetry](https://python-poetry.org/) for project management. Install it and set up your IDE accordingly.
+We use [uv](https://docs.astral.sh/uv/) for project management. Install it and set up your IDE accordingly.
 
 ## Dependencies
 
@@ -139,28 +139,22 @@ Publishing new versions to [PyPI](https://pypi.org/project/apify) is automated t
 
 3. Update the version number:
 
-- Modify the `version` field under `tool.poetry` in `pyproject.toml`.
+- Modify the `version` field under `project` in `pyproject.toml`.
 
 ```toml
-[tool.poetry]
+[project]
 name = "apify"
 version = "x.z.y"
 ```
 
 4. Generate the distribution archives for the package:
 
 ```shell
-poetry build
+uv build
 ```
 
-5. Set up the PyPI API token for authentication:
+5. Set up the PyPI API token for authentication and upload the package to PyPI:
 
 ```shell
-poetry config pypi-token.pypi YOUR_API_TOKEN
-```
-
-6. Upload the package to PyPI:
-
-```shell
-poetry publish
+uv publish --token YOUR_API_TOKEN
 ```

Makefile

@@ -1,5 +1,5 @@
 .PHONY: clean install-dev build publish-to-pypi lint type-check unit-tests unit-tests-cov \
-		integration-tests format check-code build-api-reference build-docs run-docs
+	integration-tests format check-code build-api-reference build-docs run-docs
 
 # This is default for local testing, but GitHub workflows override it to a higher value in CI
 INTEGRATION_TESTS_CONCURRENCY = 1
@@ -8,46 +8,45 @@ clean:
 	rm -rf .mypy_cache .pytest_cache .ruff_cache build dist htmlcov .coverage
 
 install-dev:
-	poetry install --all-extras
-	poetry run pre-commit install
+	uv sync --all-extras
+	uv run pre-commit install
 
 build:
-	poetry build --no-interaction -vv
+	uv build --verbose
 
 # APIFY_PYPI_TOKEN_CRAWLEE is expected to be set in the environment
 publish-to-pypi:
-	poetry config pypi-token.pypi "${APIFY_PYPI_TOKEN_CRAWLEE}"
-	poetry publish --no-interaction -vv
+	uv publish --verbose --token "${APIFY_PYPI_TOKEN_CRAWLEE}"
 
 lint:
-	poetry run ruff format --check
-	poetry run ruff check
+	uv run ruff format --check
+	uv run ruff check
 
 type-check:
-	poetry run mypy
+	uv run mypy
 
 unit-tests:
-	poetry run pytest --numprocesses=auto --verbose --cov=src/apify tests/unit
+	uv run pytest --numprocesses=auto --verbose --cov=src/apify tests/unit
 
 unit-tests-cov:
-	poetry run pytest --numprocesses=auto --verbose --cov=src/apify --cov-report=html tests/unit
+	uv run pytest --numprocesses=auto --verbose --cov=src/apify --cov-report=html tests/unit
 
 integration-tests:
-	poetry run pytest --numprocesses=$(INTEGRATION_TESTS_CONCURRENCY) --verbose tests/integration
+	uv run pytest --numprocesses=$(INTEGRATION_TESTS_CONCURRENCY) --verbose tests/integration
 
 format:
-	poetry run ruff check --fix
-	poetry run ruff format
+	uv run ruff check --fix
+	uv run ruff format
 
 # The check-code target runs a series of checks equivalent to those performed by pre-commit hooks
 # and the run_checks.yaml GitHub Actions workflow.
 check-code: lint type-check unit-tests
 
 build-api-reference:
-	cd website && poetry run ./build_api_reference.sh
+	cd website && uv run ./build_api_reference.sh
 
 build-docs:
-	cd website && poetry run npm clean-install && poetry run npm run build
+	cd website && uv run npm clean-install && uv run npm run build
 
 run-docs: build-api-reference
-	cd website && poetry run npm clean-install && poetry run npm run start
+	cd website && uv run npm clean-install && uv run npm run start

docs/02_guides/code/scrapy_project/src/__main__.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from twisted.internet import asyncioreactor
+from scrapy.utils.reactor import install_reactor
 
 # Install Twisted's asyncio reactor before importing any other Twisted or
 # Scrapy components.
-asyncioreactor.install()  # type: ignore[no-untyped-call]
+install_reactor('twisted.internet.asyncioreactor.AsyncioSelectorReactor')
 
 import os
 

docs/02_guides/code/scrapy_project/src/settings.py

@@ -5,4 +5,5 @@
 ROBOTSTXT_OBEY = True
 SPIDER_MODULES = ['src.spiders']
 TELNETCONSOLE_ENABLED = False
+# Do not change the Twisted reactor unless you really know what you are doing.
 TWISTED_REACTOR = 'twisted.internet.asyncioreactor.AsyncioSelectorReactor'

docs/02_guides/code/scrapy_project/src/spiders/__init__.py

@@ -1 +1,3 @@
 from .title import TitleSpider
+
+__all__ = ['TitleSpider']

docs/02_guides/code/scrapy_project/src/spiders/title.py

@@ -10,7 +10,7 @@
 if TYPE_CHECKING:
     from collections.abc import Generator
 
-    from scrapy.responsetypes import Response
+    from scrapy.http.response import Response
 
 
 class TitleSpider(Spider):