Merge pull request #313 from scrapy/ruff

Migrate to ruff

.github/workflows/tests.yml

@@ -48,4 +48,4 @@ jobs:
         tox
 
     - name: Upload coverage report
-      run: bash <(curl -s https://codecov.io/bash)
+      uses: codecov/codecov-action@v5

.pre-commit-config.yaml

@@ -1,18 +1,7 @@
 repos:
-- repo: https://github.com/PyCQA/bandit
-  rev: 1.7.10
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.9.3
   hooks:
-  - id: bandit
-    args: [-r, -c, .bandit.yml]
-- repo: https://github.com/PyCQA/flake8
-  rev: 7.1.1
-  hooks:
-  - id: flake8
-- repo: https://github.com/psf/black.git
-  rev: 24.10.0
-  hooks:
-  - id: black
-- repo: https://github.com/pycqa/isort
-  rev: 5.13.2
-  hooks:
-  - id: isort
+    - id: ruff
+      args: [ --fix ]
+    - id: ruff-format

docs/conf.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 
-import os
 import sys
+from pathlib import Path
 
 # Get the project root dir, which is the parent dir of this
-cwd = os.getcwd()
-project_root = os.path.dirname(cwd)
+project_root = str(Path.cwd().parent)
 
 # Insert the project root dir as the first element in the PYTHONPATH.
 # This lets us ensure that the source package is imported, and that its

docs/conftest.py

@@ -1,5 +1,5 @@
-import os
 from doctest import ELLIPSIS, NORMALIZE_WHITESPACE
+from pathlib import Path
 
 from sybil import Sybil
 
@@ -16,9 +16,8 @@
 
 
 def load_selector(filename, **kwargs):
-    input_path = os.path.join(os.path.dirname(__file__), "_static", filename)
-    with open(input_path, encoding="utf-8") as input_file:
-        return Selector(text=input_file.read(), **kwargs)
+    input_path = Path(__file__).parent / "_static" / filename
+    return Selector(text=input_path.read_text(encoding="utf-8"), **kwargs)
 
 
 def setup(namespace):

parsel/__init__.py

@@ -13,8 +13,8 @@
     "xpathfuncs",
 ]
 
-from parsel import xpathfuncs  # NOQA
-from parsel.csstranslator import css2xpath  # NOQA
-from parsel.selector import Selector, SelectorList  # NOQA
+from parsel import xpathfuncs
+from parsel.csstranslator import css2xpath
+from parsel.selector import Selector, SelectorList
 
 xpathfuncs.setup()

parsel/csstranslator.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from functools import lru_cache
-from typing import TYPE_CHECKING, Any, Optional, Protocol
+from typing import TYPE_CHECKING, Any, Protocol
 
 from cssselect import GenericTranslator as OriginalGenericTranslator
 from cssselect import HTMLTranslator as OriginalHTMLTranslator
@@ -13,17 +15,16 @@
 
 
 class XPathExpr(OriginalXPathExpr):
-
     textnode: bool = False
-    attribute: Optional[str] = None
+    attribute: str | None = None
 
     @classmethod
     def from_xpath(
         cls,
         xpath: OriginalXPathExpr,
         textnode: bool = False,
-        attribute: Optional[str] = None,
-    ) -> "Self":
+        attribute: str | None = None,
+    ) -> Self:
         x = cls(path=xpath.path, element=xpath.element, condition=xpath.condition)
         x.textnode = textnode
         x.attribute = attribute
@@ -47,12 +48,12 @@ def __str__(self) -> str:
         return path
 
     def join(
-        self: "Self",
+        self: Self,
         combiner: str,
         other: OriginalXPathExpr,
         *args: Any,
         **kwargs: Any,
-    ) -> "Self":
+    ) -> Self:
         if not isinstance(other, XPathExpr):
             raise ValueError(
                 f"Expressions of type {__name__}.XPathExpr can ony join expressions"
@@ -141,5 +142,5 @@ def css_to_xpath(self, css: str, prefix: str = "descendant-or-self::") -> str:
 
 
 def css2xpath(query: str) -> str:
-    "Return translated XPath version of a given CSS query"
+    """Return translated XPath version of a given CSS query"""
     return _translator.css_to_xpath(query)