Merge branch 'main' into update-sfdc-api-v65.0

Author: jstvz

cumulusci/__about__.py

@@ -1 +1 @@
-__version__ = "4.6.0"
+__version__ = "4.8.1"

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/dependencies.py

@@ -6,10 +6,10 @@
 from typing import List, Optional
 from zipfile import ZipFile
 
-import pydantic
+import pydantic.v1 as pydantic
 from github3.exceptions import NotFoundError
 from github3.repos.repo import Repository
-from pydantic.networks import AnyUrl
+from pydantic.v1.networks import AnyUrl
 
 from cumulusci.core.config import OrgConfig
 from cumulusci.core.config.project_config import BaseProjectConfig

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/github.py

@@ -1,7 +1,6 @@
 import os
 import shutil
 
-import fs
 from github3.exceptions import NotFoundError
 
 from cumulusci.core.exceptions import DependencyResolutionError
@@ -129,7 +128,7 @@ def resolve(self):
     def fetch(self):
         """Fetch the archive of the specified commit and construct its project config."""
         with self.project_config.open_cache(
-            fs.path.join("projects", self.repo_name, self.commit)
+            os.path.join("projects", self.repo_name, self.commit)
         ) as path:
             zf = download_extract_github(
                 self.gh, self.repo_owner, self.repo_name, ref=self.commit

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/source_transforms/transforms.py

@@ -10,7 +10,7 @@
 from zipfile import ZipFile
 
 from lxml import etree as ET
-from pydantic import BaseModel, root_validator
+from pydantic.v1 import BaseModel, root_validator
 
 from cumulusci.core.dependencies.utils import TaskContext
 from cumulusci.core.enums import StrEnum

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/core/versions.py

@@ -1,7 +1,7 @@
 import re
 from typing import Optional, Union
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from cumulusci.core.enums import StrEnum
 

cumulusci/oauth/client.py

@@ -19,7 +19,7 @@
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.x509.oid import NameOID
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from cumulusci.core.exceptions import CumulusCIUsageError
 from cumulusci.oauth.exceptions import OAuth2Error