W42 dependency updates

cumulusci/tasks/bulkdata/tests/snowfakery/query_snowfakery.recipe.yml

@@ -3,7 +3,6 @@
 
 # contact based on a user
 - object: Contact
-  include: SFStandardContact
   fields:
       __user:
           SalesforceQuery.find_record:

cumulusci/tasks/marketing_cloud/get_user_info.py

@@ -14,7 +14,7 @@ def _run_task(self):
             payload = self.mc_config.get_user_info()
         except requests.exceptions.HTTPError as e:
             self.logger.error(
-                f"Exception occurred fetching user info: {e.response.text}"
+                f"Exception occurred fetching user info: {e.response.text if e.response else 'None'}"
             )
             raise
 

cumulusci/tasks/robotframework/libdoc.py

@@ -241,7 +241,7 @@ def to_tuples(self):
                 # we don't want to see the same base pageobject
                 # keywords a kajillion times. This should probably
                 # be configurable, but I don't need it to be right now.
-                if base_pageobjects_path in keyword.source:
+                if base_pageobjects_path in str(keyword.source):
                     continue
 
                 path = Path(keyword.source)

cumulusci/tasks/robotframework/robotframework.py

@@ -1,11 +1,11 @@
+import fnmatch
 import json
 import os
 import shlex
 import subprocess
 import sys
 from pathlib import Path
 
-from robot import pythonpathsetter
 from robot import run as robot_run
 from robot.testdoc import testdoc
 
@@ -278,11 +278,8 @@ def _run_task(self):
             # Save it so that we can restore it later
             orig_sys_path = sys.path.copy()
 
-            # Add each source to PYTHONPATH. Robot recommends that we
-            # use pythonpathsetter instead of directly setting
-            # sys.path. <shrug>
             for path in source_paths.values():
-                pythonpathsetter.add_path(path, end=True)
+                add_path(path, end=True)
 
             # Make sure the path to the repo root is on sys.path. Normally
             # it will be, but if we're running this task from another repo
@@ -293,7 +290,7 @@ def _run_task(self):
             # by robot.run. Plus, robot recommends we call a special
             # function instead of directly modifying sys.path
             if self.project_config.repo_root not in sys.path:
-                pythonpathsetter.add_path(self.project_config.repo_root)
+                add_path(self.project_config.repo_root)
 
             options["stdout"] = sys.stdout
             options["stderr"] = sys.stderr
@@ -380,4 +377,16 @@ def execute_script(self, script, *args):
     WebDriver.execute_script = execute_script
 
 
+def add_path(path, end=False):
+    """
+    Adds a source to PYTHONPATH. Robot recommended that we
+    use pythonpathsetter.add_path instead of directly setting
+    sys.path, but removed this function in v6.1.
+    """
+    if not end:
+        sys.path.insert(0, path)
+    elif not any(fnmatch.fnmatch(p, path) for p in sys.path):
+        sys.path.append(path)
+
+
 patch_executescript()

cumulusci/tasks/robotframework/tests/test_robotframework.py

@@ -182,7 +182,7 @@ def test_tagstatexclude(self, mock_robot_run):
                 },
             },
         )
-        assert type(task.options["options"]["tagstatexclude"]) == list
+        assert type(task.options["options"]["tagstatexclude"]) is list
         task()
         outputdir = str(Path(".").resolve())
         mock_robot_run.assert_called_once_with(
@@ -266,9 +266,7 @@ def test_user_defined_listeners_option(self):
         assert KeywordLogger in listener_classes
 
     @mock.patch("cumulusci.tasks.robotframework.robotframework.robot_run")
-    @mock.patch(
-        "cumulusci.tasks.robotframework.robotframework.pythonpathsetter.add_path"
-    )
+    @mock.patch("cumulusci.tasks.robotframework.robotframework.add_path")
     def test_sources(self, mock_add_path, mock_robot_run):
         """Verify that sources get added to PYTHONPATH when task runs"""
         universal_config = UniversalConfig()
@@ -313,9 +311,7 @@ def test_sources(self, mock_add_path, mock_robot_run):
         )
 
     @mock.patch("cumulusci.tasks.robotframework.robotframework.robot_run")
-    @mock.patch(
-        "cumulusci.tasks.robotframework.robotframework.pythonpathsetter.add_path"
-    )
+    @mock.patch("cumulusci.tasks.robotframework.robotframework.add_path")
     def test_repo_root_in_sys_path(self, mock_add_path, mock_robot_run):
         """Verify that the repo root is added to sys.path
 

pyproject.toml

@@ -34,9 +34,10 @@ dependencies = [
     "keyring<=23.0.1",
     "defusedxml",
     "lxml",
+    "markdown-it-py==2.2.0", # resolve dependency conflict between prod/dev
     "MarkupSafe",
     "psutil",
-    "pydantic",
+    "pydantic<2",
     "PyJWT",
     "pytz",
     "pyyaml",
@@ -73,7 +74,7 @@ test = [
     "responses",
     "testfixtures",
     "tox",
-    "typeguard",
+    "typeguard<=2.13.3", # TODO: Lots of changes required for v4
     "vcrpy"
 ]
 
@@ -173,8 +174,6 @@ include = [
     'cumulusci/core/config/base_config.py',
     'cumulusci/core/config/base_task_flow_config.py',
     'cumulusci/core/config/oauth2_service_config.py',
-    'cumulusci/core/config/scratch_org_config.py',
-    'cumulusci/core/config/sfdx_org_config.py',
     'cumulusci/core/debug.py',
     'cumulusci/core/dependencies/__init__.py',
     'cumulusci/core/dependencies/utils.py',
@@ -184,7 +183,6 @@ include = [
     'cumulusci/core/metadeploy/__init__.py',
     'cumulusci/core/metadeploy/api.py',
     'cumulusci/core/runtime.py',
-    'cumulusci/core/sfdx.py',
     'cumulusci/core/source/__init__.py',
     'cumulusci/core/source/local_folder.py',
     'cumulusci/core/source_transforms/__init__.py',
@@ -199,7 +197,6 @@ include = [
     'cumulusci/salesforce_api/exceptions.py',
     'cumulusci/salesforce_api/filterable_objects.py',
     'cumulusci/salesforce_api/mc_soap_envelopes.py',
-    'cumulusci/salesforce_api/org_schema_models.py',
     'cumulusci/salesforce_api/package_install.py',
     'cumulusci/salesforce_api/soap_envelopes.py',
     'cumulusci/tasks/__init__.py',
@@ -212,17 +209,10 @@ include = [
     'cumulusci/tasks/bulkdata/generate_mapping_utils/extract_mapping_file_generator.py',
     'cumulusci/tasks/bulkdata/generate_mapping_utils/generate_mapping_from_declarations.py',
     'cumulusci/tasks/bulkdata/generate_mapping_utils/mapping_generator_post_processes.py',
-    'cumulusci/tasks/bulkdata/query_transformers.py',
-    'cumulusci/tasks/bulkdata/snowfakery_utils/snowfakery_working_directory.py',
     'cumulusci/tasks/bulkdata/snowfakery_utils/subtask_configurator.py',
     'cumulusci/tasks/dx_convert_from.py',
     'cumulusci/tasks/github/__init__.py',
     'cumulusci/tasks/github/commit_status.py',
-    'cumulusci/tasks/github/merge.py',
-    'cumulusci/tasks/github/publish.py',
-    'cumulusci/tasks/github/pull_request.py',
-    'cumulusci/tasks/github/release_report.py',
-    'cumulusci/tasks/github/tag.py',
     'cumulusci/tasks/github/util.py',
     'cumulusci/tasks/marketing_cloud/__init__.py',
     'cumulusci/tasks/marketing_cloud/api.py',
@@ -263,7 +253,6 @@ include = [
     'cumulusci/tests/util.py',
     'cumulusci/utils/waiting.py',
     'cumulusci/utils/xml/robot_xml.py',
-    'cumulusci/utils/xml/salesforce_encoding.py',
     'cumulusci/utils/ziputils.py'
 ]
 # Do not add to this list. Instead use