Drop Python 3.9, reinstate 3.14/pydantic jobs (#112)

Author: wRAR

.github/workflows/checks.yml

@@ -14,21 +14,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - python-version: 3.13
+        - python-version: "3.14"
           env:
             TOXENV: typing
-        - python-version: 3.13
+        - python-version: "3.14"
           env:
             TOXENV: docs
-        - python-version: 3.13
+        - python-version: "3.14"
           env:
             TOXENV: twinecheck
-        - python-version: 3.13
+        - python-version: "3.14"
           env:
             TOXENV: pylint
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
@@ -45,5 +45,5 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: pre-commit/action@v3.0.1

.github/workflows/publish.yml

@@ -12,10 +12,10 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       with:
-        python-version: 3.13
+        python-version: "3.14"
     - run: |
         python -m pip install --upgrade build
         python -m build

.github/workflows/tests.yml

@@ -15,21 +15,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - python-version: "3.9"
+        - python-version: "3.10"
           env:
             TOXENV: min-attrs
-        - python-version: "3.9"
+        - python-version: "3.10"
           env:
             TOXENV: min-pydantic
-        - python-version: "3.9"
+        - python-version: "3.10"
           env:
             TOXENV: min-scrapy
-        - python-version: "3.9"
+        - python-version: "3.10"
           env:
             TOXENV: min-extra
-        - python-version: "3.9"
-          env:
-            TOXENV: py
         - python-version: "3.10"
           env:
             TOXENV: py
@@ -42,21 +39,19 @@ jobs:
         - python-version: "3.13"
           env:
             TOXENV: py
-        - python-version: "3.14.0-rc.2"
+        - python-version: "3.14"
           env:
             TOXENV: py
-        - python-version: "3.14.0-rc.2"
+        - python-version: "3.14"
           env:
             TOXENV: attrs
-        # pydantic doesn't yet support 3.14
-        - python-version: "3.13"
+        - python-version: "3.14"
           env:
             TOXENV: pydantic
-        - python-version: "3.14.0-rc.2"
+        - python-version: "3.14"
           env:
             TOXENV: scrapy
-        # pydantic doesn't yet support 3.14
-        - python-version: "3.13"
+        - python-version: "3.14"
           env:
             TOXENV: extra
         - python-version: "pypy3.11"
@@ -73,7 +68,7 @@ jobs:
 
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
@@ -91,19 +86,19 @@ jobs:
       uses: codecov/codecov-action@v5
 
   tests-other-os:
-    name: "Test: py39, ${{ matrix.os }}"
+    name: "Test: py310, ${{ matrix.os }}"
     runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
         os: [macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
-        python-version: 3.9
+        python-version: "3.10"
 
     - name: Install tox
       run: pip install tox

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.13.0
+  rev: v0.15.2
   hooks:
     - id: ruff-check
       args: [ --fix ]
@@ -10,3 +10,7 @@ repos:
   hooks:
   - id: end-of-file-fixer
   - id: trailing-whitespace
+- repo: https://github.com/rhysd/actionlint
+  rev: v1.7.11
+  hooks:
+    - id: actionlint

README.md

@@ -24,7 +24,7 @@ a pre-defined interface (see [extending `itemadapter`](#extending-itemadapter)).
 
 ## Requirements
 
-* Python 3.9+, either the CPython implementation (default) or the PyPy
+* Python 3.10+, either the CPython implementation (default) or the PyPy
   implementation
 * [`scrapy`](https://scrapy.org/) 2.2+: optional, needed to interact with
   `scrapy` items

itemadapter/_imports.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import sys
 from typing import Any
 
 # attempt the following imports only once,
@@ -33,34 +34,45 @@
 except ImportError:
     attr = None
 
-pydantic_v1: Any = None
 pydantic: Any = None
+PydanticUndefined: Any = None
 
-try:
-    import pydantic
-except ImportError:  # No pydantic
-    pass
-else:
+pydantic_v1: Any = None
+PydanticV1Undefined: Any = None
+
+# pydantic v1 doesn't support Python 3.14+, on older Python versions we try to find both
+if sys.version_info < (3, 14):
     try:
-        import pydantic.v1 as pydantic_v1
-    except ImportError:  # Pydantic <1.10.17
-        pydantic_v1 = pydantic
-        pydantic = None
-    else:  # Pydantic 1.10.17+
-        if not hasattr(pydantic.BaseModel, "model_fields"):  # Pydantic <2
+        import pydantic
+    except ImportError:  # No pydantic
+        pass
+    else:
+        try:
+            import pydantic.v1 as pydantic_v1
+        except ImportError:  # Pydantic <1.10.17
             pydantic_v1 = pydantic
             pydantic = None
+        else:  # Pydantic 1.10.17+
+            if not hasattr(pydantic.BaseModel, "model_fields"):  # Pydantic >=1.10.17,<2
+                pydantic_v1 = pydantic
+                pydantic = None
+            # else Pydantic >=2
 
-try:
-    from pydantic.v1.fields import Undefined as PydanticV1Undefined
-    from pydantic_core import PydanticUndefined
-except ImportError:  # < Pydantic 2.0
     try:
-        from pydantic.fields import (  # type: ignore[attr-defined,no-redef]
-            Undefined as PydanticUndefined,
-        )
-        from pydantic.fields import (  # type: ignore[attr-defined,no-redef]
-            Undefined as PydanticV1Undefined,
-        )
-    except ImportError:
-        PydanticUndefined = PydanticV1Undefined = None  # type: ignore[assignment]
+        from pydantic.v1.fields import Undefined as PydanticV1Undefined
+        from pydantic_core import PydanticUndefined
+    except ImportError:  # Pydantic < 2.0
+        try:
+            from pydantic.fields import (  # type: ignore[attr-defined,no-redef]
+                Undefined as PydanticUndefined,
+            )
+
+            PydanticV1Undefined = PydanticUndefined
+        except ImportError:
+            pass
+else:
+    try:
+        import pydantic
+        from pydantic_core import PydanticUndefined
+    except ImportError:  # No pydantic
+        pass

itemadapter/_json_schema.py

@@ -9,6 +9,7 @@
 from copy import copy
 from enum import Enum
 from textwrap import dedent
+from types import MappingProxyType, UnionType
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -24,8 +25,6 @@
 from .utils import _is_pydantic_model
 
 if TYPE_CHECKING:
-    from types import MappingProxyType
-
     from .adapter import AdapterInterface, ItemAdapter
 
 
@@ -139,20 +138,15 @@ def array_type(type_hint):
     unique_args = set(args)
     if len(unique_args) == 1:
         return next(iter(unique_args))
-    return Union[tuple(unique_args)]
+    return Union[tuple(unique_args)]  # noqa: UP007
 
 
 def update_prop_from_pattern(prop: dict[str, Any], pattern: str) -> None:
     if is_valid_pattern(pattern):
         prop.setdefault("pattern", pattern)
 
 
-try:
-    from types import UnionType
-except ImportError:  # Python < 3.10
-    UNION_TYPES: set[Any] = {Union}
-else:
-    UNION_TYPES = {Union, UnionType}
+UNION_TYPES = {Union, UnionType}
 
 
 def update_prop_from_origin(
@@ -204,7 +198,7 @@ def update_prop_from_type(prop: dict[str, Any], prop_type: Any, state: _JsonSche
         if issubclass(prop_type, Enum):
             values = [item.value for item in prop_type]
             value_types = tuple({type(v) for v in values})
-            prop_type = value_types[0] if len(value_types) == 1 else Union[value_types]
+            prop_type = value_types[0] if len(value_types) == 1 else Union[value_types]  # noqa: UP007
             update_prop_from_type(prop, prop_type, state)
             prop.setdefault("enum", values)
             return

pyproject.toml

@@ -11,17 +11,17 @@ authors = [
 readme = "README.md"
 license = "BSD-3-Clause"
 license-files = ["LICENSE"]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "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",
     "Operating System :: OS Independent",
@@ -74,6 +74,9 @@ regex = true
 [[tool.bumpversion.files]]
 filename = "itemadapter/__init__.py"
 
+[tool.coverage.run]
+branch = true
+
 [tool.pylint.MASTER]
 persistent = "no"
 load-plugins=[
@@ -257,7 +260,3 @@ split-on-trailing-comma = false
 
 [tool.ruff.lint.pydocstyle]
 convention = "pep257"
-
-[tool.ruff.lint.pyupgrade]
-# for Pydantic annotations while we support Python 3.9
-keep-runtime-typing = true