Remove iso8601 dependency

.github/workflows/ci.yml

@@ -248,8 +248,26 @@ jobs:
           if-no-files-found: error
           include-hidden-files: true
 
+  test-windows-accel:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.14"
+      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
+      - name: Install accel extra
+        run: uv sync --frozen --extra accel --group test
+      - name: Verify ciso8601 acceleration
+        run: |
+          uv run --frozen python -c "import ciso8601; import tortoise.timezone as tz; assert tz.parse_datetime is ciso8601.parse_datetime"
+      - name: Test parser compatibility
+        run: |
+          uv pip uninstall ciso8601
+          uv run --no-sync pytest -n auto --cov=tortoise --cov-append --cov-branch --tb=native -q tests/test_iso8601.py
+
   coverage:
-    needs: [test-sqlite, test-postgres, test-mysql, test-mssql]
+    needs: [test-sqlite, test-postgres, test-mysql, test-mssql, test-windows-accel]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v6

CHANGELOG.rst

@@ -23,6 +23,10 @@ Fixed
 - ``MigrationRecorder`` now uses parameterized queries; fixes MariaDB/MySQL rejecting ISO-8601 ``applied_at`` values. (#2132)
 - ``QuerySet.count()`` now matches the limited query result for the LIMIT/OFFSET edge cases: it returns ``0`` (instead of a negative number) when ``offset()`` exceeds the total row count, and ``0`` (instead of the total) for ``limit(0)``. (#2208)
 
+Changed
+^^^^^^^
+- Removed the mandatory ``iso8601`` runtime dependency. Datetime parsing now prefers ``ciso8601`` when available and falls back to an internal parser for common ISO 8601 forms; ``ciso8601`` is also available via the ``accel`` extra on Windows CPython. (#2213)
+
 1.1.7
 -----
 

pyproject.toml

@@ -9,7 +9,6 @@ dynamic = ["version"]
 requires-python = ">=3.10"
 dependencies = [
     "pypika-tortoise (>=0.6.5,<1.0.0)",
-    "iso8601 (>=2.1.0,<3.0.0); python_version < '4.0'",
     "aiosqlite (>=0.16.0,<1.0.0)",
     "anyio",
     "tomlkit (>=0.11.4,<1.0.0); python_version < '3.11'",
@@ -46,7 +45,7 @@ ptpython = [
     "ptpython>=3.0.0",
 ]
 accel = [
-    "ciso8601; sys_platform != 'win32' and implementation_name == 'cpython'",
+    "ciso8601; implementation_name == 'cpython'",
     "uvloop; sys_platform != 'win32' and implementation_name == 'cpython'",
     "orjson",
 ]

tests/fields/test_time.py

@@ -7,7 +7,6 @@
 from zoneinfo import ZoneInfoNotFoundError
 
 import pytest
-from iso8601 import ParseError
 
 from tests import testmodels
 from tortoise import fields, timezone
@@ -673,7 +672,7 @@ async def test_date_str(db):
     obj0 = await model.create(date="2020-08-17")
     obj1 = await model.get(date="2020-08-17")
     assert obj0.date == obj1.date
-    with pytest.raises((ParseError, ValueError)):
+    with pytest.raises(ValueError):
         await model.create(date="2020-08-xx")
     await model.filter(date="2020-08-17").update(date="2020-08-18")
     obj2 = await model.get(date="2020-08-18")

tests/test_iso8601.py

@@ -0,0 +1,59 @@
+from datetime import datetime
+from datetime import timezone as dt_timezone
+
+import pytest
+
+from tortoise._iso8601 import parse_datetime
+
+
+def test_parse_datetime_accepts_common_iso8601_forms():
+    assert parse_datetime("2020-08-17") == datetime(2020, 8, 17)
+    assert parse_datetime("2020-08-17T00:00:00Z") == datetime(2020, 8, 17, tzinfo=dt_timezone.utc)
+    assert parse_datetime("2020-230T12:34:56Z") == datetime(
+        2020, 8, 17, 12, 34, 56, tzinfo=dt_timezone.utc
+    )
+    assert parse_datetime("2020-230t12:34:56") == datetime(2020, 8, 17, 12, 34, 56)
+    assert parse_datetime("2020230T123456") == datetime(2020, 8, 17, 12, 34, 56)
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "2020-08-17",
+        "20200817",
+        "2020-08-17T12:34:56",
+        "2020-08-17t12:34:56",
+        "2020-08-17 12:34:56",
+        "20200817T123456",
+        "2020-08-17T12:34:56Z",
+        "2020-08-17T12:34:56z",
+        "2020-08-17T12:34:56+08",
+        "2020-08-17T12:34:56+0800",
+        "2020-08-17T12:34:56+08:00",
+        "2020-W34-1",
+        "2020W341",
+        "2020-230",
+        "2020230",
+        "2020-230T12:34:56",
+        "2020-230t12:34:56",
+        "2020230T123456",
+    ],
+)
+def test_parse_datetime_matches_ciso8601(value):
+    ciso8601 = pytest.importorskip("ciso8601")
+
+    assert parse_datetime(value) == ciso8601.parse_datetime(value)
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "2020-13-01",
+        "2020-367",
+        "2021-02-29",
+        "2020-W54-1",
+    ],
+)
+def test_parse_datetime_rejects_invalid_dates(value):
+    with pytest.raises(ValueError):
+        parse_datetime(value)

tortoise/_iso8601.py

@@ -0,0 +1,73 @@
+from __future__ import annotations
+
+import re
+from datetime import datetime, timedelta
+
+_CALENDAR_DATE_RE = re.compile(r"^(\d{4})-(\d{2})-(\d{2})(?=$|[Tt ])")
+_BASIC_CALENDAR_DATE_RE = re.compile(r"^(\d{4})(\d{2})(\d{2})(?=$|[Tt ])")
+_ORDINAL_DATE_RE = re.compile(r"^(\d{4})-(\d{3})(?=$|[Tt ])")
+_BASIC_ORDINAL_DATE_RE = re.compile(r"^(\d{4})(\d{3})(?=$|[Tt ])")
+_WEEK_DATE_RE = re.compile(r"^(\d{4})-W(\d{2})(?:-(\d))?(?=$|[Tt ])")
+_BASIC_WEEK_DATE_RE = re.compile(r"^(\d{4})W(\d{2})(\d)?(?=$|[Tt ])")
+_BASIC_TIME_RE = re.compile(r"^(\d{2})(\d{2})?(\d{2})?([.,]\d+)?(?=$|[+-])")
+_TZ_OFFSET_RE = re.compile(r"([+-])(\d{2})(?::?(\d{2}))?$")
+
+
+def _normalize_timezone_offset(value: str) -> str:
+    if m := _TZ_OFFSET_RE.search(value):
+        return f"{value[: m.start()]}{m[1]}{m[2]}:{m[3] or '00'}"
+    return value
+
+
+def _normalize_datetime_suffix(value: str, *, allow_basic_time: bool) -> str:
+    if not value:
+        return value
+
+    sep, time_value = value[0], _normalize_timezone_offset(value[1:])
+    if allow_basic_time and (m := _BASIC_TIME_RE.match(time_value)):
+        minute = m[2] or "00"
+        second = f":{m[3]}" if m[3] else ""
+        fraction = m[4] or ""
+        time_value = f"{m[1]}:{minute}{second}{fraction}{time_value[m.end() :]}"
+    return f"{sep}{time_value}"
+
+
+def _ordinal_date(year: str, day: str) -> datetime:
+    year_int, day_int = int(year), int(day)
+    value = datetime(year_int, 1, 1) + timedelta(days=day_int - 1)
+    if day_int < 1 or value.year != year_int:
+        raise ValueError(f"Invalid ordinal day: {day_int} is out of range for year {year_int}")
+    return value
+
+
+def parse_datetime(value: str) -> datetime:
+    if value.endswith(("Z", "z")):
+        value = f"{value[:-1]}+00:00"
+    try:
+        return datetime.fromisoformat(value)
+    except ValueError:
+        if m := _CALENDAR_DATE_RE.match(value):
+            date_value = datetime(int(m[1]), int(m[2]), int(m[3])).date()
+            suffix = _normalize_datetime_suffix(value[m.end() :], allow_basic_time=False)
+            return datetime.fromisoformat(f"{date_value.isoformat()}{suffix}")
+        if m := _BASIC_CALENDAR_DATE_RE.match(value):
+            date_value = datetime(int(m[1]), int(m[2]), int(m[3])).date()
+            suffix = _normalize_datetime_suffix(value[m.end() :], allow_basic_time=True)
+            return datetime.fromisoformat(f"{date_value.isoformat()}{suffix}")
+        if m := _ORDINAL_DATE_RE.match(value):
+            date_value = _ordinal_date(m[1], m[2]).date()
+            suffix = _normalize_datetime_suffix(value[m.end() :], allow_basic_time=False)
+            return datetime.fromisoformat(f"{date_value.isoformat()}{suffix}")
+        if m := _BASIC_ORDINAL_DATE_RE.match(value):
+            date_value = _ordinal_date(m[1], m[2]).date()
+            suffix = _normalize_datetime_suffix(value[m.end() :], allow_basic_time=True)
+            return datetime.fromisoformat(f"{date_value.isoformat()}{suffix}")
+        if m := _WEEK_DATE_RE.match(value):
+            date_value = datetime.fromisocalendar(int(m[1]), int(m[2]), int(m[3] or 1)).date()
+            suffix = _normalize_datetime_suffix(value[m.end() :], allow_basic_time=False)
+            return datetime.fromisoformat(f"{date_value.isoformat()}{suffix}")
+        if m := _BASIC_WEEK_DATE_RE.match(value):
+            date_value = datetime.fromisocalendar(int(m[1]), int(m[2]), int(m[3] or 1)).date()
+            suffix = _normalize_datetime_suffix(value[m.end() :], allow_basic_time=True)
+            return datetime.fromisoformat(f"{date_value.isoformat()}{suffix}")
+        raise

tortoise/backends/oracle/client.py

@@ -1,17 +1,9 @@
 from __future__ import annotations
 
 import datetime
-import functools
 from typing import TYPE_CHECKING, Any, SupportsInt, cast
 
 import pyodbc
-
-try:
-    from ciso8601 import parse_datetime
-except ImportError:  # pragma: nocoverage
-    from iso8601 import parse_date
-
-    parse_datetime = functools.partial(parse_date, default_timezone=None)
 from pypika_tortoise import OracleQuery
 
 from tortoise.backends.base.client import (
@@ -28,7 +20,7 @@
 )
 from tortoise.backends.oracle.executor import OracleExecutor
 from tortoise.backends.oracle.schema_generator import OracleSchemaGenerator
-from tortoise.timezone import UTC, get_use_tz
+from tortoise.timezone import UTC, get_use_tz, parse_datetime
 
 if TYPE_CHECKING:  # pragma: nocoverage
     import asyncodbc  # pylint: disable=W0611

tortoise/fields/data.py

@@ -18,16 +18,15 @@
 from tortoise import timezone
 from tortoise.exceptions import ConfigurationError, FieldError
 from tortoise.fields.base import Field
-from tortoise.timezone import get_default_timezone, get_timezone, get_use_tz, localtime
+from tortoise.timezone import (
+    get_default_timezone,
+    get_timezone,
+    get_use_tz,
+    localtime,
+    parse_datetime,
+)
 from tortoise.validators import MaxLengthValidator
 
-try:
-    from ciso8601 import parse_datetime
-except ImportError:  # pragma: nocoverage
-    from iso8601 import parse_date
-
-    parse_datetime = functools.partial(parse_date, default_timezone=None)
-
 try:
     from pydantic import BaseModel as _PydanticBaseModel
     from pydantic._internal._model_construction import ModelMetaclass as _PydanticModelMetaclass

tortoise/timezone.py

@@ -3,6 +3,7 @@
 import functools
 import os
 import sys
+from collections.abc import Callable
 from datetime import datetime, time, tzinfo
 from zoneinfo import ZoneInfo as _ZoneInfo
 from zoneinfo import ZoneInfoNotFoundError
@@ -14,6 +15,12 @@
 
     UTC = timezone.utc
 
+parse_datetime: Callable[[str], datetime]
+try:
+    from ciso8601 import parse_datetime as parse_datetime
+except ImportError:  # pragma: nocoverage
+    from tortoise._iso8601 import parse_datetime as parse_datetime
+
 
 class ZoneInfo(_ZoneInfo):
     @property