Merge master with conflict manually resolved

dandischema/models.py

@@ -2,8 +2,7 @@
 from enum import Enum
 import os
 import re
-import sys
-from typing import Any, Dict, List, Optional, Sequence, Type, TypeVar, Union
+from typing import Any, Dict, List, Literal, Optional, Sequence, Type, TypeVar, Union
 from warnings import warn
 
 from pydantic import (
@@ -47,11 +46,6 @@ def __get_pydantic_json_schema__(
         return handler(core_schema.int_schema())
 
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
 # Use DJANGO_DANDI_WEB_APP_URL to point to a specific deployment.
 DANDI_INSTANCE_URL: Optional[str]
 try:

dandischema/tests/test_models.py

@@ -1,8 +1,7 @@
 import enum
 from enum import Enum
 from inspect import isclass
-import sys
-from typing import Any, Dict, List, Optional, Type, Union
+from typing import Any, Dict, List, Literal, Optional, Type, Union
 
 import pydantic
 from pydantic import Field, ValidationError
@@ -34,11 +33,6 @@
     RoleType,
 )
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
 
 def test_dandiset() -> None:
     assert Dandiset.model_construct()

dandischema/utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re
 from typing import Iterator, List
 
@@ -43,13 +45,12 @@ def split_camel_case(s: str) -> Iterator[str]:
         yield s[last_start:]
 
 
-def version2tuple(ver: str) -> tuple:
+def version2tuple(ver: str) -> tuple[int, int, int]:
     """Convert version to numeric tuple"""
-    import re
-
-    if re.match(r"\d+\.\d+\.\d+$", ver) is None:
+    if m := re.fullmatch(r"(\d+)\.(\d+)\.(\d+)", ver, flags=re.ASCII):
+        return (int(m[1]), int(m[2]), int(m[3]))
+    else:
         raise ValueError(r"Version must be well formed: \d+\.\d+\.\d+")
-    return tuple([int(val) for val in ver.split(".")])
 
 
 def _ensure_newline(obj: str) -> str: