Merge pull request #245 from scrapy/3.14rc

Add Python 3.14 RC1 to CI, bump tool versions

Author: wRAR

.git-blame-ignore-revs

@@ -1,3 +1,3 @@
 # This is a list of commits that git blame should ignore
 # running pre-commit on all the code
-47be6dd35faf78f06b6183ea9dad6b5f78f5c756
+47be6dd35faf78f06b6183ea9dad6b5f78f5c756

.github/workflows/tests-macos.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14.0-rc.1"]
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/tests-ubuntu.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.10", "pypy3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14.0-rc.1", "pypy3.10", "pypy3.11"]
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/tests-windows.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14.0-rc.1"]
 
     steps:
     - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -1,7 +1,22 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.2
+  rev: v0.12.5
   hooks:
-    - id: ruff
+    - id: ruff-check
       args: [ --fix ]
     - id: ruff-format
+- repo: https://github.com/adamchainz/blacken-docs
+  rev: 1.19.1
+  hooks:
+  - id: blacken-docs
+    additional_dependencies:
+    - black==25.1.0
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
+- repo: https://github.com/sphinx-contrib/sphinx-lint
+  rev: v1.0.0
+  hooks:
+    - id: sphinx-lint

LICENSE

@@ -4,10 +4,10 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-    1. Redistributions of source code must retain the above copyright notice, 
+    1. Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
-    
-    2. Redistributions in binary form must reproduce the above copyright 
+
+    2. Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 

docs/conf.py

@@ -46,7 +46,7 @@
 
 # General information about the project.
 project = "w3lib"
-copyright = "2014, w3lib developers"
+project_copyright = "2014, w3lib developers"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

pyproject.toml

@@ -17,13 +17,14 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Programming Language :: Python :: Implementation :: PyPy",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
@@ -35,8 +36,7 @@ Homepage = "https://github.com/scrapy/w3lib"
 Documentation = "https://w3lib.readthedocs.io/en/latest/"
 Source = "https://github.com/scrapy/w3lib"
 Tracker = "https://github.com/scrapy/w3lib/issues"
-Changelog = "https://github.com/scrapy/w3lib/commits/master/"
-releasenotes = "https://w3lib.readthedocs.io/en/latest/#changelog"
+"Release notes" = "https://w3lib.readthedocs.io/en/latest/#changelog"
 
 [tool.hatch.version]
 path = "w3lib/__init__.py"
@@ -116,10 +116,16 @@ disable = [
 
 [tool.ruff.lint]
 extend-select = [
+    # flake8-builtins
+    "A",
+    # flake8-async
+    "ASYNC",
     # flake8-bugbear
     "B",
     # flake8-comprehensions
     "C4",
+    # flake8-commas
+    "COM",
     # pydocstyle
     "D",
     # flake8-future-annotations
@@ -176,6 +182,8 @@ extend-select = [
 ignore = [
     # Within an `except` clause, raise exceptions with `raise ... from`
     "B904",
+    # Trailing comma missing
+    "COM812",
     # Missing docstring in public module
     "D100",
     # Missing docstring in public class
@@ -232,5 +240,8 @@ ignore = [
     "S101",
 ]
 
+[tool.ruff.lint.isort]
+split-on-trailing-comma = false
+
 [tool.ruff.lint.pydocstyle]
 convention = "pep257"

tests/test_encoding.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
 import codecs
+import random
+from io import BytesIO
 from typing import Any
 
 from w3lib.encoding import (
@@ -266,9 +268,6 @@ def test_utf16_32(self):
         self._assert_encoding("utf-32", "hi".encode("utf-32-be"), "utf-32-be", "hi")
 
     def test_python_crash(self):
-        import random
-        from io import BytesIO
-
         random.seed(42)
         buf = BytesIO()
         for _ in range(150000):

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py39, py310, py311, py312, py313, pypy3.10, docs, pylint, typing, pre-commit, twinecheck
+envlist = py39, py310, py311, py312, py313, py314, pypy3.10, pypy3.11, docs, pylint, typing, pre-commit, twinecheck
 
 [testenv]
 deps =
@@ -21,14 +21,14 @@ commands =
 basepython = python3
 deps =
     pytest
-    mypy==1.15.0
+    mypy==1.17.0
 commands =
     mypy --strict {posargs: w3lib tests}
 
 [testenv:pylint]
 deps =
     {[testenv]deps}
-    pylint==3.3.6
+    pylint==3.3.7
 commands =
     pylint docs tests w3lib