Merge remote-tracking branch 'origin/master' into release-notes-2.18

This commit is contained in:
Adrian Chaves 2026-08-10 19:35:01 +02:00
commit e46bd554b4
7 changed files with 2180 additions and 2189 deletions

View File

@ -27,7 +27,7 @@ repos:
hooks: hooks:
- id: sphinx-lint - id: sphinx-lint
- repo: https://github.com/scrapy/sphinx-scrapy - repo: https://github.com/scrapy/sphinx-scrapy
rev: 0.8.10 rev: 0.8.11
hooks: hooks:
- id: sphinx-scrapy - id: sphinx-scrapy
- repo: https://github.com/zizmorcore/zizmor-pre-commit - repo: https://github.com/zizmorcore/zizmor-pre-commit

View File

@ -137,14 +137,6 @@ def source_role(
return [node], [] return [node], []
def issue_role(
name, rawtext, text: str, lineno, inliner, options=None, content=None
) -> tuple[list[Any], list[Any]]:
ref = "https://github.com/scrapy/scrapy/issues/" + text
node = nodes.reference(rawtext, "issue " + text, refuri=ref)
return [node], []
def commit_role( def commit_role(
name, rawtext, text: str, lineno, inliner, options=None, content=None name, rawtext, text: str, lineno, inliner, options=None, content=None
) -> tuple[list[Any], list[Any]]: ) -> tuple[list[Any], list[Any]]:
@ -164,7 +156,6 @@ def rev_role(
def setup(app: Sphinx) -> dict[str, Any]: def setup(app: Sphinx) -> dict[str, Any]:
app.add_role("source", source_role) app.add_role("source", source_role)
app.add_role("commit", commit_role) app.add_role("commit", commit_role)
app.add_role("issue", issue_role)
app.add_role("rev", rev_role) app.add_role("rev", rev_role)
app.add_node( app.add_node(

View File

@ -141,7 +141,7 @@ middleware with a :ref:`custom downloader middleware
- If you can meet the installation requirements, use pyre2_ instead of - If you can meet the installation requirements, use pyre2_ instead of
Pythons re_ to compile your URL-filtering regular expression. See Pythons re_ to compile your URL-filtering regular expression. See
:issue:`1908`. :gh:`1908`.
See also `other suggestions at StackOverflow See also `other suggestions at StackOverflow
<https://stackoverflow.com/q/36440681>`__. <https://stackoverflow.com/q/36440681>`__.
@ -419,7 +419,7 @@ Running ``runspider`` I get ``error: No spider found in file: <filename>``
This may happen if your Scrapy project has a spider module with a name that This may happen if your Scrapy project has a spider module with a name that
conflicts with the name of one of the `Python standard library modules`_, such conflicts with the name of one of the `Python standard library modules`_, such
as ``csv.py`` or ``os.py``, or any `Python package`_ that you have installed. as ``csv.py`` or ``os.py``, or any `Python package`_ that you have installed.
See :issue:`2680`. See :gh:`2680`.
.. _has been reported: https://github.com/scrapy/scrapy/issues/2905 .. _has been reported: https://github.com/scrapy/scrapy/issues/2905

File diff suppressed because it is too large Load Diff

View File

@ -6,4 +6,4 @@ sphinx-notfound-page
sphinx-reredirects sphinx-reredirects
sphinx-rtd-theme sphinx-rtd-theme
sphinx-rtd-dark-mode sphinx-rtd-dark-mode
sphinx-scrapy @ git+https://github.com/scrapy/sphinx-scrapy.git@0.8.10 sphinx-scrapy @ git+https://github.com/scrapy/sphinx-scrapy.git@0.8.11

View File

@ -156,7 +156,7 @@ sphinx-rtd-theme==3.1.0
# via # via
# -r docs/requirements.in # -r docs/requirements.in
# sphinx-rtd-dark-mode # sphinx-rtd-dark-mode
sphinx-scrapy @ git+https://github.com/scrapy/sphinx-scrapy.git@fe176adc1a8577601bc3fa39b590ebed71a7e9b8 sphinx-scrapy @ git+https://github.com/scrapy/sphinx-scrapy.git@6f8e5e0bbd171a857da480f7188f2a205041cb60
# via -r docs/requirements.in # via -r docs/requirements.in
sphinx-sitemap==2.9.0 sphinx-sitemap==2.9.0
# via sphinx-scrapy # via sphinx-scrapy

View File

@ -5,7 +5,7 @@
[tox] [tox]
requires = requires =
sphinx-scrapy[tox] @ git+https://github.com/scrapy/sphinx-scrapy.git@0.8.10 sphinx-scrapy[tox] @ git+https://github.com/scrapy/sphinx-scrapy.git@0.8.11
tox-uv tox-uv
envlist = envlist =
pre-commit pre-commit