Uprev pydantic to v2.0a4

pydantic · May 12, 2023 · 2ec8b42 · 2ec8b42
1 parent 3d5dbd8
commit 2ec8b42
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,7 +40,7 @@ classifiers = [
 ]
 requires-python = '>=3.7'
 dependencies = [
-    'pydantic==v2.0a3',
+    'pydantic==v2.0a4',
     'python-dotenv>=0.21.0',
 ]
 dynamic = ['version']

diff --git a/tests/test_settings.py b/tests/test_settings.py
@@ -57,7 +57,9 @@ def test_sub_env_override(env):
 def test_sub_env_missing():
     with pytest.raises(ValidationError) as exc_info:
         SimpleSettings()
-    assert exc_info.value.errors() == [{'type': 'missing', 'loc': ('apple',), 'msg': 'Field required', 'input': {}}]
+    assert exc_info.value.errors(include_url=False) == [
+        {'type': 'missing', 'loc': ('apple',), 'msg': 'Field required', 'input': {}}
+    ]
 
 
 def test_other_setting():
@@ -227,7 +229,7 @@ class AnnotatedComplexSettings(BaseSettings):
     env.set('apples', '["russet"]')
     with pytest.raises(ValidationError) as exc_info:
         AnnotatedComplexSettings()
-    assert exc_info.value.errors() == [
+    assert exc_info.value.errors(include_url=False) == [
         {
             'ctx': {'actual_length': 1, 'field_type': 'List', 'min_length': 2},
             'input': ['russet'],
@@ -292,7 +294,7 @@ class ComplexSettings(BaseSettings):
     env.set('field', '{"x": "a"}')
     with pytest.raises(ValidationError) as exc_info:
         ComplexSettings()
-    assert exc_info.value.errors() == [
+    assert exc_info.value.errors(include_url=False) == [
         {
             'input': 'a',
             'loc': ('field', 'x'),
@@ -318,7 +320,7 @@ class ComplexSettings(BaseSettings):
     env.set('field', '{"x": "a"}')
     with pytest.raises(ValidationError) as exc_info:
         ComplexSettings()
-    assert exc_info.value.errors() == [
+    assert exc_info.value.errors(include_url=False) == [
         {
             'input': 'a',
             'loc': ('field', 'x'),
@@ -344,7 +346,7 @@ class ComplexSettings(BaseSettings):
     env.set('field', '{"x": "a"}')
     with pytest.raises(ValidationError) as exc_info:
         ComplexSettings()
-    assert exc_info.value.errors() == [
+    assert exc_info.value.errors(include_url=False) == [
         {
             'input': 'a',
             'loc': ('field', 'x'),
@@ -507,7 +509,9 @@ class Settings(BaseSettings):
     env.set('p_foo', 'bar')
     with pytest.raises(ValidationError) as exc_info:
         Settings()
-    assert exc_info.value.errors() == [{'type': 'missing', 'loc': ('foo',), 'msg': 'Field required', 'input': {}}]
+    assert exc_info.value.errors(include_url=False) == [
+        {'type': 'missing', 'loc': ('foo',), 'msg': 'Field required', 'input': {}}
+    ]
 
     env.set('foo', 'bar')
     assert Settings().foobar == 'bar'
@@ -523,7 +527,9 @@ class Settings(BaseSettings):
     monkeypatch.setattr(os, 'environ', value={'Foo': 'foo'})
     with pytest.raises(ValidationError) as exc_info:
         Settings()
-    assert exc_info.value.errors() == [{'type': 'missing', 'loc': ('foo',), 'msg': 'Field required', 'input': {}}]
+    assert exc_info.value.errors(include_url=False) == [
+        {'type': 'missing', 'loc': ('foo',), 'msg': 'Field required', 'input': {}}
+    ]
 
 
 def test_nested_dataclass(env):
@@ -684,7 +690,7 @@ class Settings(BaseSettings):
 
     with pytest.raises(ValidationError) as exc_info:
         Settings()
-    assert exc_info.value.errors() == [
+    assert exc_info.value.errors(include_url=False) == [
         {
             'type': 'missing',
             'loc': ('a',),
@@ -1127,7 +1133,9 @@ class Settings(BaseSettings):
     with pytest.raises(ValidationError) as exc_info:
         Settings()
 
-    assert exc_info.value.errors() == [{'type': 'missing', 'loc': ('foo',), 'msg': 'Field required', 'input': {}}]
+    assert exc_info.value.errors(include_url=False) == [
+        {'type': 'missing', 'loc': ('foo',), 'msg': 'Field required', 'input': {}}
+    ]
 
 
 def test_secrets_invalid_secrets_dir(tmp_path):
@@ -1546,7 +1554,7 @@ class Settings(BaseSettings):
 
     with pytest.raises(ValidationError) as exc_info:
         Settings()
-    assert exc_info.value.errors() == [
+    assert exc_info.value.errors(include_url=False) == [
         {'type': 'extra_forbidden', 'loc': ('x',), 'msg': 'Extra inputs are not permitted', 'input': 'y'}
     ]