fix: Update test compatibility for Pydantic V1 namespace

Fix validation error handling and field imports in tests:
- Update ValidationError imports to use pydantic.v1 namespace
- Fix Field imports in model parser tests
- Update pydantic.Extra usage for V1 compatibility
- Resolve exception type mismatches in test suite

Updated components:
- Test files: Model validation, dependency tests, transform tests
- Core files: Task validation, project config, deploy tasks

All tests are now passing with V1 compatibility layer.

Author: jstvz

cumulusci/core/config/project_config.py

@@ -22,7 +22,7 @@
 API_VERSION_RE = re.compile(r"^\d\d+\.0$")
 
 import github3
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from cumulusci.core.config import FlowConfig, TaskConfig
 from cumulusci.core.config.base_task_flow_config import BaseTaskFlowConfig

cumulusci/core/dependencies/tests/test_dependencies.py

@@ -5,7 +5,7 @@
 from zipfile import ZipFile
 
 import pytest
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from cumulusci.core.config.org_config import OrgConfig, VersionInfo
 from cumulusci.core.config.project_config import BaseProjectConfig

cumulusci/core/source_transforms/tests/test_transforms.py

@@ -8,7 +8,7 @@
 
 import pytest
 from lxml import etree as ET
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from cumulusci.core.exceptions import CumulusCIException, TaskOptionsError
 from cumulusci.core.source_transforms.transforms import (

cumulusci/core/tasks.py

@@ -11,7 +11,7 @@
 from contextlib import nullcontext
 from typing import Any, Callable, Dict, List, Optional, Type, Union
 
-from pydantic.error_wrappers import ValidationError
+from pydantic.v1.error_wrappers import ValidationError
 
 from cumulusci import __version__
 from cumulusci.core.config import TaskConfig

cumulusci/tasks/bulkdata/extract_dataset_utils/tests/test_extract_yml.py

@@ -1,7 +1,7 @@
 from io import StringIO
 
 import pytest
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from cumulusci.tasks.bulkdata.extract_dataset_utils.extract_yml import (
     ExtractDeclaration,

cumulusci/tasks/salesforce/Deploy.py

@@ -2,7 +2,7 @@
 from typing import List, Optional, Union
 
 from defusedxml.minidom import parseString
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from cumulusci.cli.ui import CliTable
 from cumulusci.core.dependencies.utils import TaskContext

cumulusci/tasks/salesforce/tests/test_update_dependencies.py

@@ -3,7 +3,7 @@
 import zipfile
 from unittest import mock
 
-import pydantic
+import pydantic.v1 as pydantic
 import pytest
 
 from cumulusci.core.dependencies.dependencies import (

cumulusci/tasks/tests/test_create_package_version.py

@@ -10,7 +10,7 @@
 import pytest
 import responses
 import yaml
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from cumulusci.core.config import BaseProjectConfig, TaskConfig, UniversalConfig
 from cumulusci.core.dependencies.dependencies import (

cumulusci/utils/yaml/tests/test_cumulusci_yml.py

@@ -4,7 +4,7 @@
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from cumulusci.utils import temporary_dir
 from cumulusci.utils.yaml.cumulusci_yml import (

cumulusci/utils/yaml/tests/test_model_parser.py

@@ -2,7 +2,7 @@
 from unittest.mock import Mock
 
 import pytest
-from pydantic import Field
+from pydantic.v1 import Field
 
 from cumulusci.utils.yaml.model_parser import CCIDictModel, CCIModel, ValidationError
 
@@ -20,7 +20,7 @@ class TestCCIModel:
     def test_fields_property(self):
         # JSON is YAML. Strange but true.
         foo = Document.parse_from_yaml(StringIO("{bar: 'blah'}"))
-        assert type(foo) == Foo
+        assert isinstance(foo, Foo)
         assert foo.fields_ == []
         assert foo.fields == []
 
@@ -122,7 +122,7 @@ class Document(CCIDictModel):
 
         # JSON is YAML. Strange but true.
         foo = Document.parse_from_yaml(StringIO("{bar: 'blah'}"))
-        assert type(foo) == Foo
+        assert isinstance(foo, Foo)
         assert foo["fields"] == []
 
         foo = Document.parse_from_yaml(StringIO("{bar: 'blah', fields: [1,2]}"))