Migrate to hatchling, add Python 3.14, drop 3.9, bump linters (#11)

Author: wRAR

.github/workflows/publish.yml

@@ -1,27 +1,49 @@
 name: publish
+
+permissions:
+  contents: read
+
 on:
   push:
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
 jobs:
-  deploy:
+  build:
+    name: Build distribution
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: "3.14"
+    - name: Install pypa/build
+      run: python3 -m pip install build --user
+    - name: Build a binary wheel and a source tarball
+      run: python3 -m build
+    - name: Store the distribution packages
+      uses: actions/upload-artifact@v7
+      with:
+        name: python-package-distributions
+        path: dist/
+
+  publish:
+    name: Publish to PyPI
+    needs:
+    - build
     runs-on: ubuntu-latest
     environment:
       name: pypi
       url: https://pypi.org/p/form2request
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
+    - name: Download all the dists
+      uses: actions/download-artifact@v8
       with:
-        python-version: '3.13'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build
-    - name: Build package
-      run: python -m build
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0  # 1.9.0
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution to PyPI
+      uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b  # 1.14.0

.github/workflows/test.yml

@@ -1,4 +1,8 @@
 name: tox
+
+permissions:
+  contents: read
+
 on:
   push:
     branches: [ main ]
@@ -11,22 +15,24 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - python-version: '3.9'
+        - python-version: '3.10'
           toxenv: min
-        - python-version: '3.9'
+        - python-version: '3.10'
           toxenv: min-extra
-        - python-version: '3.9'
         - python-version: '3.10'
         - python-version: '3.11'
         - python-version: '3.12'
         - python-version: '3.13'
-        - python-version: '3.13'
+        - python-version: '3.14'
+        - python-version: '3.14'
           toxenv: extra
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -36,20 +42,26 @@ jobs:
     - name: tox
       run: |
         tox -e ${{ matrix.toxenv || 'py' }}
-    - name: coverage
-      if: ${{ success() }}
-      uses: codecov/codecov-action@v5
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v6
+    - name: Upload test results
+      if: ${{ !cancelled() }}
+      uses: codecov/codecov-action@v6
+      with:
+        report_type: test_results
   check:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.13"]
+        python-version: ["3.14"]
         tox-job: ["pre-commit", "mypy", "docs", "doctest", "twinecheck"]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.gitignore

@@ -2,6 +2,7 @@
 *.egg-info/
 /.coverage
 /coverage.xml
+*.junit.xml
 /build/
 /dist/
 /.tox/

.pre-commit-config.yaml

@@ -1,13 +1,26 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.2
+  rev: v0.15.17
   hooks:
-    - id: ruff
+    - id: ruff-check
       args: [ --fix ]
     - id: ruff-format
 - repo: https://github.com/adamchainz/blacken-docs
-  rev: 1.19.1
+  rev: 1.20.0
   hooks:
   - id: blacken-docs
     additional_dependencies:
-    - black==25.1.0
+    - black==26.3.1
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v6.0.0
+  hooks:
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
+- repo: https://github.com/sphinx-contrib/sphinx-lint
+  rev: v1.0.2
+  hooks:
+    - id: sphinx-lint
+- repo: https://github.com/rhysd/actionlint
+  rev: v1.7.12
+  hooks:
+    - id: actionlint

.readthedocs.yml

@@ -5,7 +5,7 @@ sphinx:
 build:
   os: ubuntu-24.04
   tools:
-    python: "3.13"  # Keep in sync with .github/workflows/test.yml
+    python: "3.14"  # Keep in sync with .github/workflows/test.yml
 python:
   install:
     - requirements: docs/requirements.txt

MANIFEST.in

@@ -20,7 +20,7 @@ form2request
 
 .. description starts
 
-``form2request`` is a Python 3.9+ library to build HTTP requests out of HTML
+``form2request`` is a Python library to build HTTP requests out of HTML
 forms.
 
 .. description ends

README.rst

@@ -1,5 +1,5 @@
 project = "form2request"
-copyright = "Zyte Group Ltd"
+project_copyright = "Zyte Group Ltd"
 release = "0.2.0"
 
 extensions = [
@@ -30,6 +30,8 @@
             "HtmlElement",
             "Selector",
             "SelectorList",
+            # documented there as web_poet.page_inputs.http.HttpRequest, may need :canonical:
+            "web_poet.HttpRequest",
         )
     ),
 ]

docs/conf.py

@@ -258,13 +258,13 @@ software.
 :class:`~form2request.Request` also provides conversion methods for common use
 cases:
 
--   :meth:`~form2request.Request.to_scrapy`, for :doc:`Scrapy 1.1.0+
+-   :meth:`~form2request.Request.to_scrapy`, for :doc:`Scrapy 1.7.1+
     <scrapy:index>`:
 
     >>> request_data.to_scrapy(callback=self.parse)  # doctest: +SKIP
     <GET https://example.com?foo=bar>
 
--   :meth:`~form2request.Request.to_requests`, for :doc:`requests 1.0.0+
+-   :meth:`~form2request.Request.to_requests`, for :doc:`requests 2.8.0+
     <requests:index>` (see an example :ref:`above <requests-example>`).
 
 -   :meth:`~form2request.Request.to_poet`, for :doc:`web-poet 0.2.0+

docs/usage.rst

@@ -1,22 +1,18 @@
 from __future__ import annotations
 
 import uuid
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Optional,
-    Union,
-    cast,
-)
+from typing import TYPE_CHECKING, Any, TypeAlias, cast
 from urllib.parse import urlencode, urljoin, urlsplit, urlunsplit
 
 from parsel import Selector, SelectorList
 from w3lib.html import strip_html5_whitespace
 
 if TYPE_CHECKING:
+    import requests
+    import scrapy
+    import web_poet
     from lxml.html import FormElement, HtmlElement
 
 
@@ -29,9 +25,9 @@ class FileField:
     content_type: str = "application/octet-stream"
 
 
-FormdataVType = Union[str, FileField, Iterable[str]]
-FormdataKVType = tuple[str, FormdataVType]
-FormdataType = Optional[Union[dict[str, FormdataVType], Iterable[FormdataKVType]]]
+FormdataVType: TypeAlias = str | FileField | Iterable[str]
+FormdataKVType: TypeAlias = tuple[str, FormdataVType]
+FormdataType: TypeAlias = dict[str, FormdataVType] | Iterable[FormdataKVType] | None
 
 
 def _parsel_to_lxml(
@@ -211,14 +207,14 @@ class Request:
     headers: list[tuple[str, str]]
     body: bytes
 
-    def to_poet(self, **kwargs: Any):
+    def to_poet(self, **kwargs: Any) -> web_poet.HttpRequest:
         """Convert the request to :class:`web_poet.HttpRequest
         <web_poet.page_inputs.http.HttpRequest>`.
 
         All *kwargs* are passed to :class:`web_poet.HttpRequest
         <web_poet.page_inputs.http.HttpRequest>` as is.
         """
-        import web_poet
+        import web_poet  # noqa: PLC0415
 
         return web_poet.HttpRequest(
             url=self.url,
@@ -228,12 +224,12 @@ def to_poet(self, **kwargs: Any):
             **kwargs,
         )
 
-    def to_requests(self, **kwargs: Any):
+    def to_requests(self, **kwargs: Any) -> requests.PreparedRequest:
         """Convert the request to :class:`requests.PreparedRequest`.
 
         All *kwargs* are passed to :class:`requests.Request` as is.
         """
-        import requests
+        import requests  # noqa: PLC0415
 
         request = requests.Request(
             self.method,
@@ -244,12 +240,12 @@ def to_requests(self, **kwargs: Any):
         )
         return request.prepare()
 
-    def to_scrapy(self, callback: Callable, **kwargs: Any):
+    def to_scrapy(self, callback: Callable, **kwargs: Any) -> scrapy.Request:
         """Convert the request to :class:`scrapy.Request`.
 
         All *kwargs* are passed to :class:`scrapy.Request` as is.
         """
-        import scrapy
+        import scrapy  # noqa: PLC0415
 
         return scrapy.Request(
             self.url,