mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-18 00:10:04 +00:00
devel/py-pydantic2: Allow build with py-pydantic-core 2.25.1
- Bump PORTREVISION for package change
Obtained from: 6b92e9dab9
This commit is contained in:
Po-Chuan Hsieh
parent
755a96a9ca
commit
6558dcc04c
@ -1,6 +1,6 @@
|
||||
PORTNAME= pydantic
|
||||
PORTVERSION= 2.9.2
|
||||
PORTREVISION= 4
|
||||
PORTREVISION= 5
|
||||
CATEGORIES= devel python
|
||||
MASTER_SITES= PYPI
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>=22.5.0:devel/py-hatch-fancy-pypi-readme@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
|
||||
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}annotated-types>=0.6.0:devel/py-annotated-types@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}pydantic-core>=2.25.0<2.25.0_99:devel/py-pydantic-core@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}pydantic-core>=2.25.1<2.25.1_99:devel/py-pydantic-core@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.12.2:devel/py-typing-extensions@${PY_FLAVOR}
|
||||
|
||||
USES= python
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
Obtained from: https://github.com/pydantic/pydantic/commit/9b69920888054df4ef544ecbdc03e09b90646ac2
|
||||
https://github.com/pydantic/pydantic/commit/51cf3cbfa767abfba1048cae41ea766d6add4f4a
|
||||
https://github.com/pydantic/pydantic/commit/27afdfc9120c7a5b1071d907a25c37b46b103292
|
||||
https://github.com/pydantic/pydantic/commit/6b92e9dab9eb3e649af148d5d8a9a8d2d2cd31d2
|
||||
|
||||
--- pydantic/_internal/_config.py.orig 2020-02-02 00:00:00 UTC
|
||||
+++ pydantic/_internal/_config.py
|
||||
@ -13,30 +14,6 @@ Obtained from: https://github.com/pydantic/pydantic/commit/9b69920888054df4ef544
|
||||
|
||||
if not TYPE_CHECKING:
|
||||
# See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
|
||||
@@ -69,7 +69,7 @@ class ConfigWrapper:
|
||||
strict: bool
|
||||
# whether instances of models and dataclasses (including subclass instances) should re-validate, default 'never'
|
||||
revalidate_instances: Literal['always', 'never', 'subclass-instances']
|
||||
- ser_json_timedelta: Literal['iso8601', 'float']
|
||||
+ ser_json_timedelta: Literal['iso8601', 'seconds_float', 'milliseconds_float']
|
||||
ser_json_bytes: Literal['utf8', 'base64', 'hex']
|
||||
val_json_bytes: Literal['utf8', 'base64', 'hex']
|
||||
ser_json_inf_nan: Literal['null', 'constants', 'strings']
|
||||
@@ -168,6 +168,14 @@ class ConfigWrapper:
|
||||
A `CoreConfig` object created from config.
|
||||
"""
|
||||
config = self.config_dict
|
||||
+
|
||||
+ if config.get('ser_json_timedelta') == 'float':
|
||||
+ warnings.warn(
|
||||
+ 'The `float` option for `ser_json_timedelta` has been deprecated in favor of `seconds_float`. Please use this setting instead.',
|
||||
+ PydanticDeprecatedSince210,
|
||||
+ stacklevel=2,
|
||||
+ )
|
||||
+ config['ser_json_timedelta'] = 'seconds_float'
|
||||
|
||||
core_config_values = {
|
||||
'title': config.get('title') or (obj and obj.__name__),
|
||||
--- pydantic/_internal/_core_utils.py.orig 2020-02-02 00:00:00 UTC
|
||||
+++ pydantic/_internal/_core_utils.py
|
||||
@@ -44,10 +44,6 @@ Used in a `Tag` schema to specify the tag used for a d
|
||||
@ -79,28 +56,6 @@ Obtained from: https://github.com/pydantic/pydantic/commit/9b69920888054df4ef544
|
||||
return recurse(s, _is_schema_valid)
|
||||
|
||||
walk_core_schema(schema, _is_schema_valid)
|
||||
--- pydantic/config.py.orig 2020-02-02 00:00:00 UTC
|
||||
+++ pydantic/config.py
|
||||
@@ -563,13 +563,15 @@ class ConfigDict(TypedDict, total=False):
|
||||
3. Using `'never'` we would have gotten `user=SubUser(hobbies=['scuba diving'], sins=['lying'])`.
|
||||
"""
|
||||
|
||||
- ser_json_timedelta: Literal['iso8601', 'float']
|
||||
+ ser_json_timedelta: Literal['iso8601', 'seconds_float', 'milliseconds_float']
|
||||
"""
|
||||
- The format of JSON serialized timedeltas. Accepts the string values of `'iso8601'` and
|
||||
- `'float'`. Defaults to `'iso8601'`.
|
||||
+ The format of JSON serialized timedeltas. Accepts the string values of `'iso8601'`,
|
||||
+ `'seconds_float'`, and `'milliseconds_float'`. Defaults to `'iso8601'`.
|
||||
|
||||
- `'iso8601'` will serialize timedeltas to ISO 8601 durations.
|
||||
- - `'float'` will serialize timedeltas to the total number of seconds.
|
||||
+ - `'seconds_float'` will serialize timedeltas to the total number of seconds.
|
||||
+ - `'milliseconds_float'` will serialize timedeltas to the total number of milliseconds.
|
||||
+ NOTE: `'float' is deprecated in v2.10 in favour of `'milliseconds_float'`
|
||||
"""
|
||||
|
||||
ser_json_bytes: Literal['utf8', 'base64', 'hex']
|
||||
--- pydantic/json_schema.py.orig 2020-02-02 00:00:00 UTC
|
||||
+++ pydantic/json_schema.py
|
||||
@@ -555,6 +555,12 @@ class GenerateJsonSchema:
|
||||
@ -116,15 +71,6 @@ Obtained from: https://github.com/pydantic/pydantic/commit/9b69920888054df4ef544
|
||||
def any_schema(self, schema: core_schema.AnySchema) -> JsonSchemaValue:
|
||||
"""Generates a JSON schema that matches any value.
|
||||
|
||||
@@ -720,7 +726,7 @@ class GenerateJsonSchema:
|
||||
Returns:
|
||||
The generated JSON schema.
|
||||
"""
|
||||
- if self._config.ser_json_timedelta == 'float':
|
||||
+ if self._config.ser_json_timedelta in {'milliseconds_float', 'seconds_float'}:
|
||||
return {'type': 'number'}
|
||||
return {'type': 'string', 'format': 'duration'}
|
||||
|
||||
--- pydantic/networks.py.orig 2020-02-02 00:00:00 UTC
|
||||
+++ pydantic/networks.py
|
||||
@@ -4,13 +4,16 @@ import re
|
||||
@ -903,39 +849,13 @@ Obtained from: https://github.com/pydantic/pydantic/commit/9b69920888054df4ef544
|
||||
'typing-extensions>=4.12.2; python_version >= "3.13"',
|
||||
'annotated-types>=0.6.0',
|
||||
- "pydantic-core==2.23.4",
|
||||
+ "pydantic-core==2.25.0",
|
||||
+ "pydantic-core==2.25.1",
|
||||
]
|
||||
dynamic = ['version', 'readme']
|
||||
|
||||
--- tests/test_json_schema.py.orig 2020-02-02 00:00:00 UTC
|
||||
+++ tests/test_json_schema.py
|
||||
@@ -108,6 +108,7 @@ from pydantic.types import (
|
||||
conint,
|
||||
constr,
|
||||
)
|
||||
+from pydantic.warnings import PydanticDeprecatedSince210
|
||||
|
||||
try:
|
||||
import email_validator
|
||||
@@ -1777,11 +1778,15 @@ def test_model_default():
|
||||
@pytest.mark.parametrize(
|
||||
'ser_json_timedelta,properties',
|
||||
[
|
||||
- ('float', {'duration': {'default': 300.0, 'title': 'Duration', 'type': 'number'}}),
|
||||
+ ('seconds_float', {'duration': {'default': 300.0, 'title': 'Duration', 'type': 'number'}}),
|
||||
+ ('milliseconds_float', {'duration': {'default': 300000.0, 'title': 'Duration', 'type': 'number'}}),
|
||||
('iso8601', {'duration': {'default': 'PT5M', 'format': 'duration', 'title': 'Duration', 'type': 'string'}}),
|
||||
],
|
||||
)
|
||||
-def test_model_default_timedelta(ser_json_timedelta: Literal['float', 'iso8601'], properties: typing.Dict[str, Any]):
|
||||
+def test_model_default_timedelta(
|
||||
+ ser_json_timedelta: Literal['iso8601', 'seconds_float', 'milliseconds_float'],
|
||||
+ properties: typing.Dict[str, Any],
|
||||
+):
|
||||
class Model(BaseModel):
|
||||
model_config = ConfigDict(ser_json_timedelta=ser_json_timedelta)
|
||||
|
||||
@@ -1795,6 +1800,22 @@ def test_model_default_timedelta(ser_json_timedelta: L
|
||||
@@ -1795,6 +1795,22 @@ def test_model_default_timedelta(ser_json_timedelta: L
|
||||
}
|
||||
|
||||
|
||||
@ -958,102 +878,6 @@ Obtained from: https://github.com/pydantic/pydantic/commit/9b69920888054df4ef544
|
||||
@pytest.mark.parametrize(
|
||||
'ser_json_bytes,properties',
|
||||
[
|
||||
@@ -1819,12 +1840,14 @@ def test_model_default_bytes(ser_json_bytes: Literal['
|
||||
@pytest.mark.parametrize(
|
||||
'ser_json_timedelta,properties',
|
||||
[
|
||||
- ('float', {'duration': {'default': 300.0, 'title': 'Duration', 'type': 'number'}}),
|
||||
+ ('seconds_float', {'duration': {'default': 300.0, 'title': 'Duration', 'type': 'number'}}),
|
||||
+ ('milliseconds_float', {'duration': {'default': 300000.0, 'title': 'Duration', 'type': 'number'}}),
|
||||
('iso8601', {'duration': {'default': 'PT5M', 'format': 'duration', 'title': 'Duration', 'type': 'string'}}),
|
||||
],
|
||||
)
|
||||
def test_dataclass_default_timedelta(
|
||||
- ser_json_timedelta: Literal['float', 'iso8601'], properties: typing.Dict[str, Any]
|
||||
+ ser_json_timedelta: Literal['iso8601', 'milliseconds_float', 'seconds_float'],
|
||||
+ properties: typing.Dict[str, Any],
|
||||
):
|
||||
@dataclass(config=ConfigDict(ser_json_timedelta=ser_json_timedelta))
|
||||
class Dataclass:
|
||||
@@ -1838,6 +1861,20 @@ def test_dataclass_default_timedelta(
|
||||
}
|
||||
|
||||
|
||||
+def test_dataclass_default_timedelta_float():
|
||||
+ with pytest.warns(PydanticDeprecatedSince210):
|
||||
+
|
||||
+ @dataclass(config=ConfigDict(ser_json_timedelta='float'))
|
||||
+ class Dataclass:
|
||||
+ duration: timedelta = timedelta(minutes=5)
|
||||
+
|
||||
+ assert TypeAdapter(Dataclass).json_schema(mode='serialization') == {
|
||||
+ 'properties': {'duration': {'default': 300.0, 'title': 'Duration', 'type': 'number'}},
|
||||
+ 'title': 'Dataclass',
|
||||
+ 'type': 'object',
|
||||
+ }
|
||||
+
|
||||
+
|
||||
@pytest.mark.parametrize(
|
||||
'ser_json_bytes,properties',
|
||||
[
|
||||
@@ -1861,24 +1898,49 @@ def test_dataclass_default_bytes(ser_json_bytes: Liter
|
||||
@pytest.mark.parametrize(
|
||||
'ser_json_timedelta,properties',
|
||||
[
|
||||
- ('float', {'duration': {'default': 300.0, 'title': 'Duration', 'type': 'number'}}),
|
||||
+ ('seconds_float', {'duration': {'default': 300.0, 'title': 'Duration', 'type': 'number'}}),
|
||||
+ ('milliseconds_float', {'duration': {'default': 300000.0, 'title': 'Duration', 'type': 'number'}}),
|
||||
('iso8601', {'duration': {'default': 'PT5M', 'format': 'duration', 'title': 'Duration', 'type': 'string'}}),
|
||||
],
|
||||
)
|
||||
def test_typeddict_default_timedelta(
|
||||
- ser_json_timedelta: Literal['float', 'iso8601'], properties: typing.Dict[str, Any]
|
||||
+ ser_json_timedelta: Literal['iso8601', 'milliseconds_float', 'seconds_float'],
|
||||
+ properties: typing.Dict[str, Any],
|
||||
):
|
||||
class MyTypedDict(TypedDict):
|
||||
__pydantic_config__ = ConfigDict(ser_json_timedelta=ser_json_timedelta)
|
||||
|
||||
duration: Annotated[timedelta, Field(timedelta(minutes=5))]
|
||||
|
||||
- # insert_assert(TypeAdapter(MyTypedDict).json_schema(mode='serialization'))
|
||||
- assert TypeAdapter(MyTypedDict).json_schema(mode='serialization') == {
|
||||
- 'properties': properties,
|
||||
- 'title': 'MyTypedDict',
|
||||
- 'type': 'object',
|
||||
- }
|
||||
+ if ser_json_timedelta == 'float':
|
||||
+ with pytest.warns(PydanticDeprecatedSince210):
|
||||
+ # insert_assert(TypeAdapter(MyTypedDict).json_schema(mode='serialization'))
|
||||
+ assert TypeAdapter(MyTypedDict).json_schema(mode='serialization') == {
|
||||
+ 'properties': properties,
|
||||
+ 'title': 'MyTypedDict',
|
||||
+ 'type': 'object',
|
||||
+ }
|
||||
+ else:
|
||||
+ assert TypeAdapter(MyTypedDict).json_schema(mode='serialization') == {
|
||||
+ 'properties': properties,
|
||||
+ 'title': 'MyTypedDict',
|
||||
+ 'type': 'object',
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+def test_typeddict_default_timedelta_float():
|
||||
+ class MyTypedDict(TypedDict):
|
||||
+ __pydantic_config__ = ConfigDict(ser_json_timedelta='float')
|
||||
+
|
||||
+ duration: Annotated[timedelta, Field(timedelta(minutes=5))]
|
||||
+
|
||||
+ with pytest.warns(PydanticDeprecatedSince210):
|
||||
+ # insert_assert(TypeAdapter(MyTypedDict).json_schema(mode='serialization'))
|
||||
+ assert TypeAdapter(MyTypedDict).json_schema(mode='serialization') == {
|
||||
+ 'properties': {'duration': {'default': 300.0, 'title': 'Duration', 'type': 'number'}},
|
||||
+ 'title': 'MyTypedDict',
|
||||
+ 'type': 'object',
|
||||
+ }
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
--- tests/test_networks.py.orig 2020-02-02 00:00:00 UTC
|
||||
+++ tests/test_networks.py
|
||||
@@ -107,7 +107,6 @@ except ImportError:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user