8000 Update pyo3 to 0.18.1 (#388) · pydantic/pydantic-core@27a3367 · GitHub
[go: up one dir, main page]
8000
Skip to content

Commit 27a3367

Browse files
cdce8pcdce8p
authored
Update pyo3 to 0.18.1 (#388)
* Update pyo3 to 0.18.1 * Remove pytest.mark.xfail * Lint
1 parent bfb373c commit 27a3367

File tree

7 files changed

+41
-41
lines changed

7 files changed

+41
-41
lines changed

‎Cargo.lock

Lines changed: 39 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ include = [
2626
]
2727

2828
[dependencies]
29-
# required since `Py_Ellipsis` fails on windows, see https://github.com/PyO3/pyo3/pull/2911
30-
pyo3 = { git = "https://github.com/PyO3/pyo3", branch = "release-0.18.1" }
31-
#pyo3 = "0.18.0"
29+
pyo3 = "0.18.1"
3230
regex = "1.6.0"
3331
strum = { version = "0.24.1", features = ["derive"] }
3432
strum_macros = "0.24.3"
@@ -67,6 +65,4 @@ strip = true
6765
[build-dependencies]
6866
version_check = "0.9.4"
6967
# used where logic has to be version/distribution specific, e.g. pypy
70-
# FIXME change when `pyo3` above is updated
71-
pyo3-build-config = { git = "https://github.com/PyO3/pyo3", branch = "release-0.18.1" }
72-
#pyo3 = "0.18.0"
68+
pyo3-build-config = "0.18.1"

‎tests/serializers/test_any.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import json
2-
import sys
32
from dataclasses import dataclass
43
from datetime import date, datetime, time, timedelta, timezone
54
from decimal import Decimal
@@ -253,7 +252,6 @@ def test_exclude_unset(any_serializer):
253252
assert any_serializer.to_python(m2, exclude_unset=True) == {'bar': 2, 'spam': 3}
254253

255254

256-
@pytest.mark.xfail(sys.platform == 'win32', reason='https://github.com/PyO3/pyo3/issues/2913')
257255
def test_unknown_type(any_serializer):
258256
class Foobar:
259257
def __repr__(self):

‎tests/serializers/test_bytes.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import base64
22
import json
3-
import sys
43
from enum import Enum
54

65
import pytest
@@ -74,7 +73,6 @@ class BytesEnum(bytes, Enum):
7473
bar = b'bar-value'
7574

7675

77-
@pytest.mark.xfail(sys.platform == 'win32', reason='https://github.com/PyO3/pyo3/issues/2913', strict=False)
7876
@pytest.mark.parametrize('schema_type', ['bytes', 'any'])
7977
@pytest.mark.parametrize(
8078
'input_value,expected_json',

‎tests/serializers/test_simple.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import json
2-
import sys
32
from enum import IntEnum
43

54
import pytest
@@ -20,7 +19,6 @@ class FloatSubClass(float):
2019
pass
2120

2221

23-
@pytest.mark.xfail(sys.platform == 'win32', reason='https://github.com/PyO3/pyo3/issues/2913', strict=False)
2422
@pytest.mark.parametrize('custom_type_schema', [None, 'any'])
2523
@pytest.mark.parametrize(
2624
'schema_type,value,expected_python,expected_json',

‎tests/serializers/test_string.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import json
2-
import sys
32
from enum import Enum
43

54
import pytest
@@ -61,7 +60,6 @@ class StrEnum(str, Enum):
6160
bar = 'bar-value'
6261

6362

64-
@pytest.mark.xfail(sys.platform == 'win32', reason='https://github.com/PyO3/pyo3/issues/2913', strict=False)
6563
@pytest.mark.parametrize('schema_type', ['str', 'any'])
6664
@pytest.mark.parametrize(
6765
'input_value,expected', [(StrSubclass('foo'), 'foo'), (StrMixin('foo'), 'foo'), (StrEnum.foo, 'foo-value')]

‎tests/validators/test_list.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import platform
22
import re
3-
import sys
43
from collections import deque
54
from collections.abc import Sequence
65
from typing import Any, Dict
@@ -318,7 +317,6 @@ def count(self, value):
318317
return MySequence
319318

320319

321-
@pytest.mark.xfail(sys.platform == 'win32', reason='TODO: why doesnt `validate_python` raise an error on windows here?')
322320
def test_sequence(MySequence):
323321
v = SchemaValidator({'type': 'list', 'items_schema': {'type': 'int'}})
324322
with pytest.raises(ValidationError) as exc_info:

0 commit comments

Comments
 (0)
0