Update to latest typing-extensions, add test

pydantic · Dec 2, 2023 · bd5d307 · bd5d307
1 parent dbb3d2e
commit bd5d307
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 88 deletions.
diff --git a/pdm.lock b/pdm.lock
diff --git a/pydantic/fields.py b/pydantic/fields.py
@@ -293,10 +293,10 @@ class MyModel(pydantic.BaseModel):
                 new_field_info.frozen = final or field_info.frozen
                 metadata: list[Any] = []
                 for a in extra_args:
-                    if not isinstance(a, FieldInfo):
-                        metadata.append(a)
-                    elif _typing_extra.is_deprecated_instance(a):
+                    if _typing_extra.is_deprecated_instance(a):
                         new_field_info.deprecated = True
+                    elif not isinstance(a, FieldInfo):
+                        metadata.append(a)
                     else:
                         metadata.extend(a.metadata)
                 new_field_info.metadata = metadata
@@ -369,10 +369,10 @@ class MyModel(pydantic.BaseModel):
                 field_info = FieldInfo.merge_field_infos(*field_infos, annotation=first_arg, default=default)
                 metadata: list[Any] = []
                 for a in extra_args:
-                    if not isinstance(a, FieldInfo):
-                        metadata.append(a)
-                    elif _typing_extra.is_deprecated_instance(a):
+                    if _typing_extra.is_deprecated_instance(a):
                         field_info.deprecated = True
+                    elif not isinstance(a, FieldInfo):
+                        metadata.append(a)
                     else:
                         metadata.extend(a.metadata)
                 field_info.metadata = metadata

diff --git a/pydantic/types.py b/pydantic/types.py
@@ -2825,7 +2825,7 @@ def __get_pydantic_core_schema__(cls, source_type: Any, handler: GetCoreSchemaHa
 
 
 # Can't use `Field(deprecated=True)` because of a circular import
-Deprecated = Annotated[T, deprecated("")]
+Deprecated = Annotated[T, deprecated('')]
 """
 Mark a field as being deprecated.
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -63,7 +63,7 @@ classifiers = [
 ]
 requires-python = '>=3.8'
 dependencies = [
-    'typing-extensions>=4.6.1',
+    'typing-extensions>=4.9.0rc1',
     'annotated-types>=0.4.0',
     "pydantic-core==2.14.3",
 ]