[pull] master from scrapy:master

.git-blame-ignore-revs

@@ -1,7 +1,7 @@
 # .git-blame-ignore-revs
 # adding black formatter to all the code
 e211ec0aa26ecae0da8ae55d064ea60e1efe4d0d
-# re applying black to the code with default line length
+# reapplying black to the code with default line length
 303f0a70fcf8067adf0a909c2096a5009162383a
-# reaplying black again and removing line length on pre-commit black config
+# reapplying black again and removing line length on pre-commit black config
 c5cdd0d30ceb68ccba04af0e71d1b8e6678e2962

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,13 @@
+---
+name: Question / Help
+about: Ask a question about Scrapy or ask for help with your Scrapy code.
+---
+
+Thanks for taking an interest in Scrapy!
+
+The Scrapy GitHub issue tracker is not meant for questions or help. Please ask
+for help in the [Scrapy community resources](https://scrapy.org/community/)
+instead.
+
+The GitHub issue tracker's purpose is to deal with bug reports and feature
+requests for the project itself.

.github/workflows/checks.yml

@@ -1,31 +1,38 @@
 name: Checks
 on: [push, pull_request]
 
+concurrency:
+  group: ${{github.workflow}}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   checks:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-        - python-version: "3.11"
+        - python-version: "3.13"
           env:
             TOXENV: pylint
-        - python-version: 3.8
+        - python-version: "3.9"
           env:
             TOXENV: typing
-        - python-version: "3.11"  # Keep in sync with .readthedocs.yml
+        - python-version: "3.9"
+          env:
+            TOXENV: typing-tests
+        - python-version: "3.13"  # Keep in sync with .readthedocs.yml
           env:
             TOXENV: docs
-        - python-version: "3.11"
+        - python-version: "3.13"
           env:
             TOXENV: twinecheck
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -38,5 +45,5 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: pre-commit/[email protected].0
+    - uses: actions/checkout@v4
+    - uses: pre-commit/[email protected].1

.github/workflows/publish.yml

@@ -4,18 +4,26 @@ on:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
 
+concurrency:
+  group: ${{github.workflow}}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   publish:
+    name: Upload release to PyPI
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/Scrapy
+    permissions:
+      id-token: write
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: "3.13"
       - run: | 
-          pip install --upgrade build twine
+          python -m pip install --upgrade build
           python -m build
       - name: Publish to PyPI
-        uses: pypa/[email protected]
-        with:
-          password: ${{ secrets.PYPI_TOKEN }}
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/tests-macos.yml

@@ -1,19 +1,23 @@
 name: macOS
 on: [push, pull_request]
 
+concurrency:
+  group: ${{github.workflow}}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
-    runs-on: macos-11
+    runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -23,4 +27,4 @@ jobs:
         tox -e py
 
     - name: Upload coverage report
-      run: bash <(curl -s https://codecov.io/bash)
+      uses: codecov/codecov-action@v5

.github/workflows/tests-ubuntu.yml

@@ -1,14 +1,18 @@
 name: Ubuntu
 on: [push, pull_request]
 
+concurrency:
+  group: ${{github.workflow}}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-        - python-version: 3.9
+        - python-version: "3.9"
           env:
             TOXENV: py
         - python-version: "3.10"
@@ -17,50 +21,59 @@ jobs:
         - python-version: "3.11"
           env:
             TOXENV: py
-        - python-version: "3.11"
+        - python-version: "3.12"
+          env:
+            TOXENV: py
+        - python-version: "3.13"
+          env:
+            TOXENV: py
+        - python-version: "3.13"
           env:
             TOXENV: asyncio
-        - python-version: pypy3.9
+        - python-version: pypy3.10
           env:
             TOXENV: pypy3
 
         # pinned deps
-        - python-version: 3.8.17
+        - python-version: 3.9.19
           env:
             TOXENV: pinned
-        - python-version: 3.8.17
+        - python-version: 3.9.19
           env:
             TOXENV: asyncio-pinned
-        - python-version: pypy3.8
+        - python-version: pypy3.10
           env:
             TOXENV: pypy3-pinned
-        - python-version: 3.8.17
+        - python-version: 3.9.19
           env:
             TOXENV: extra-deps-pinned
-        - python-version: 3.8.17
+        - python-version: 3.9.19
           env:
             TOXENV: botocore-pinned
 
-        - python-version: "3.11"
+        - python-version: "3.13"
           env:
             TOXENV: extra-deps
-        - python-version: "3.11"
+        - python-version: pypy3.10
+          env:
+            TOXENV: pypy3-extra-deps
+        - python-version: "3.13"
           env:
             TOXENV: botocore
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Install system libraries
-      if: matrix.python-version == 'pypy3.9' || contains(matrix.env.TOXENV, 'pinned')
+      if: contains(matrix.python-version, 'pypy') || contains(matrix.env.TOXENV, 'pinned')
       run: |
         sudo apt-get update
-        sudo apt-get install libxml2-dev libxslt-dev
+        sudo apt-get install libxml2-dev libxslt-dev libjpeg-dev
 
     - name: Run tests
       env: ${{ matrix.env }}
@@ -69,4 +82,4 @@ jobs:
         tox
 
     - name: Upload coverage report
-      run: bash <(curl -s https://codecov.io/bash)
+      uses: codecov/codecov-action@v5

.github/workflows/tests-windows.yml

@@ -1,38 +1,41 @@
 name: Windows
 on: [push, pull_request]
 
+concurrency:
+  group: ${{github.workflow}}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-        - python-version: 3.8
+        - python-version: "3.9"
           env:
             TOXENV: windows-pinned
-        - python-version: 3.9
+        - python-version: "3.10"
           env:
             TOXENV: py
-        - python-version: "3.10"
+        - python-version: "3.11"
           env:
             TOXENV: py
-        - python-version: "3.10"
+        - python-version: "3.12"
+          env:
+            TOXENV: py
+        - python-version: "3.13"
+          env:
+            TOXENV: py
+        - python-version: "3.13"
           env:
             TOXENV: asyncio
-# no binary package for lxml for 3.11 yet
-#        - python-version: "3.11"
-#          env:
-#            TOXENV: py
-#        - python-version: "3.11"
-#          env:
-#            TOXENV: asyncio
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -41,3 +44,6 @@ jobs:
       run: |
         pip install -U tox
         tox
+
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v5