Merge remote-tracking branch 'origin/remove-iso8601' into slim

Author: waketzheng

.github/workflows/ci.yml

@@ -77,6 +77,10 @@ jobs:
           DEST_SANIC: examples/sanic
           PYTHONDEVMODE: 1
           PYTEST_ARGS: "-n auto --cov=tortoise --cov-append --cov-branch --tb=native -q"
+      - name: Test not ciso8601
+        run: |
+          uv pip uninstall ciso8601
+          uv run --no-sync make test_sqlite
       - name: Upload Coverage
         run: |
           uvx coveralls --service=github

pyproject.toml

@@ -9,7 +9,6 @@ dynamic = [ "version" ]
 requires-python = ">=3.9"
 dependencies = [
     "pypika-tortoise (>=0.6.3,<1.0.0)",
-    "iso8601 (>=2.1.0,<3.0.0); python_version < '4.0'",
     "aiosqlite (>=0.16.0,<1.0.0)",
     "anyio",
     "pytz",

tests/fields/test_time.py

@@ -5,7 +5,6 @@
 from unittest.mock import patch
 
 import pytz
-from iso8601 import ParseError
 
 from tests import testmodels
 from tortoise import Model, fields, timezone
@@ -316,7 +315,7 @@ async def test_date_str(self):
         obj0 = await self.model.create(date="2020-08-17")
         obj1 = await self.model.get(date="2020-08-17")
         self.assertEqual(obj0.date, obj1.date)
-        with self.assertRaises((ParseError, ValueError)):
+        with self.assertRaises(ValueError):
             await self.model.create(date="2020-08-xx")
         await self.model.filter(date="2020-08-17").update(date="2020-08-18")
         obj2 = await self.model.get(date="2020-08-18")

tortoise/backends/oracle/client.py

@@ -1,18 +1,10 @@
 from __future__ import annotations
 
 import datetime
-import functools
 from typing import TYPE_CHECKING, Any, SupportsInt, cast
 
 import pyodbc
 import pytz
-
-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 (
@@ -29,6 +21,7 @@
 )
 from tortoise.backends.oracle.executor import OracleExecutor
 from tortoise.backends.oracle.schema_generator import OracleSchemaGenerator
+from tortoise.fields.data import parse_datetime
 
 if TYPE_CHECKING:  # pragma: nocoverage
     import asyncodbc  # pylint: disable=W0611

tortoise/fields/data.py

@@ -3,6 +3,7 @@
 import datetime
 import functools
 import json
+import re
 import warnings
 from collections.abc import Callable
 from decimal import Decimal
@@ -23,9 +24,85 @@
 try:
     from ciso8601 import parse_datetime
 except ImportError:  # pragma: nocoverage
-    from iso8601 import parse_date
+    # Copied from https://github.com/micktwomey/pyiso8601/blob/main/iso8601/iso8601.py
+    ISO8601_REGEX = re.compile(
+        r"""
+        (?P<year>[0-9]{4})
+        (
+            (
+                (-(?P<monthdash>[0-9]{1,2}))
+                |
+                (?P<month>[0-9]{2})
+                (?!$)  # Don't allow YYYYMM
+            )
+            (
+                (
+                    (-(?P<daydash>[0-9]{1,2}))
+                    |
+                    (?P<day>[0-9]{2})
+                )
+                (
+                    (
+                        (?P<separator>[ T])
+                        (?P<hour>[0-9]{2})
+                        (:{0,1}(?P<minute>[0-9]{2})){0,1}
+                        (
+                            :{0,1}(?P<second>[0-9]{1,2})
+                            ([.,](?P<second_fraction>[0-9]+)){0,1}
+                        ){0,1}
+                        (?P<timezone>
+                            Z
+                            |
+                            (
+                                (?P<tz_sign>[-+])
+                                (?P<tz_hour>[0-9]{2})
+                                :{0,1}
+                                (?P<tz_minute>[0-9]{2}){0,1}
+                            )
+                        ){0,1}
+                    ){0,1}
+                )
+            ){0,1}  # YYYY-MM
+        ){0,1}  # YYYY only
+        $
+        """,
+        re.VERBOSE,
+    )
+
+    def parse_datetime(datetime_string: str) -> datetime.datetime:
+        if not (m := ISO8601_REGEX.match(datetime_string)):
+            raise ValueError(f"Unable to parse date string {datetime_string!r}")
+        # Drop any Nones from the regex matches
+        # TODO: check if there's a way to omit results in regexes
+        groups: dict[str, str] = {k: v for k, v in m.groupdict().items() if v is not None}
+        zone = None
+        if tz := groups.get("timezone", None):
+            if tz.upper() == "Z":
+                zone = datetime.timezone.utc
+            else:
+                sign = groups.get("tz_sign", None)
+                hours = int(groups.get("tz_hour", 0))
+                minutes = int(groups.get("tz_minute", 0))
+                description = f"{sign}{hours:02d}:{minutes:02d}"
+                if sign == "-":
+                    hours = -hours
+                    minutes = -minutes
+                zone = datetime.timezone(
+                    datetime.timedelta(hours=hours, minutes=minutes), description
+                )
+        return datetime.datetime(
+            year=int(groups.get("year", 0)),
+            month=int(groups.get("month", groups.get("monthdash", 1))),
+            day=int(groups.get("day", groups.get("daydash", 1))),
+            hour=int(groups.get("hour", 0)),
+            minute=int(groups.get("minute", 0)),
+            second=int(groups.get("second", 0)),
+            microsecond=int(
+                Decimal(f"0.{groups.get('second_fraction', 0)}") * Decimal("1000000.0")
+            ),
+            tzinfo=zone,
+        )
 
-    parse_datetime = functools.partial(parse_date, default_timezone=None)
 
 if TYPE_CHECKING:  # pragma: nocoverage
     from tortoise.models import Model