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

jstvz · web-flow · commit 209e8d1cf6b2 · 2025-09-02T16:53:53.000-07:00
diff --git a/.github/workflows/feature_test.yml b/.github/workflows/feature_test.yml
@@ -30,7 +30,7 @@ jobs:
             - name: Set up uv
               uses: SFDO-Tooling/setup-uv@main
               with:
-                  version: "0.5.0"
+                  version: "0.8.4"
                   enable-cache: true
             - name: Install dependencies
               run: uv sync --group docs
@@ -56,7 +56,7 @@ jobs:
             - name: Set up uv
               uses: SFDO-Tooling/setup-uv@main
               with:
-                  version: "0.5.0"
+                  version: "0.8.4"
                   enable-cache: true
             - name: Install dependencies
               run: uv sync -p ${{ matrix.python-version }}
@@ -80,7 +80,7 @@ jobs:
             - name: Set up uv
               uses: SFDO-Tooling/setup-uv@main
               with:
-                  version: "0.5.0"
+                  version: "0.8.4"
                   enable-cache: true
             - name: Install dependencies
               run: uv sync --all-extras -p ${{ matrix.python-version }}
@@ -99,7 +99,7 @@ jobs:
             - name: Set up uv
               uses: SFDO-Tooling/setup-uv@main
               with:
-                  version: "0.5.0"
+                  version: "0.8.4"
                   enable-cache: true
             - name: Install dependencies
               run: uv sync -p 3.11
diff --git a/.github/workflows/release_test_sfdx.yml b/.github/workflows/release_test_sfdx.yml
@@ -48,7 +48,7 @@ jobs:
             - name: Set up uv
               uses: SFDO-Tooling/setup-uv@main
               with:
-                  version: "0.5.0"
+                  version: "0.8.4"
                   enable-cache: true
             - name: Install Python dependencies
               run: uv sync
diff --git a/.github/workflows/slow_integration_tests.yml b/.github/workflows/slow_integration_tests.yml
@@ -34,7 +34,7 @@ jobs:
             - name: Set up uv
               uses: SFDO-Tooling/setup-uv@main
               with:
-                  version: "0.5.0"
+                  version: "0.8.4"
                   enable-cache: true
             - name: Install dependencies
               run: uv sync -p 3.11
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -39,3 +39,4 @@ For example:
 * Chandler Anderson (zenibako)
 * Ben French (BenjaminFrench)
 * Rupert Barrow (rupertbarrow)
+* Rupesh J (rupeshjSFDC)
diff --git a/cumulusci/__about__.py b/cumulusci/__about__.py
@@ -1 +1 @@
-__version__ = "4.4.0"
+__version__ = "4.5.0"
diff --git a/cumulusci/__init__.py b/cumulusci/__init__.py
@@ -1,15 +1,15 @@
 import os
 import sys
+from importlib.metadata import PackageNotFoundError, version
 
 from simple_salesforce import api, bulk
 
-from cumulusci.__about__ import __version__
-
-__import__("pkg_resources").declare_namespace("cumulusci")
-
 __location__ = os.path.dirname(os.path.realpath(__file__))
 
-__version__ = __version__
+try:
+    __version__ = version("cumulusci")
+except PackageNotFoundError:
+    __version__ = "unknown"
 
 if sys.version_info < (3, 8):  # pragma: no cover
     raise Exception("CumulusCI requires Python 3.8+.")
diff --git a/cumulusci/cli/robot.py b/cumulusci/cli/robot.py
@@ -1,7 +1,7 @@
+import importlib.metadata
 import sys
 
 import click
-import pkg_resources
 import sarge
 
 from .runtime import pass_runtime
@@ -109,5 +109,8 @@ def _require_npm():
 
 def _is_package_installed(package_name):
     """Return True if the given package is installed"""
-    # technique shamelessly stolen from https://stackoverflow.com/a/44210735/7432
-    return package_name in {pkg.key for pkg in pkg_resources.working_set}
+    try:
+        importlib.metadata.distribution(package_name)
+        return True
+    except importlib.metadata.PackageNotFoundError:
+        return False
diff --git a/cumulusci/cli/runtime.py b/cumulusci/cli/runtime.py
@@ -6,7 +6,7 @@
 
 import click
 import keyring
-import pkg_resources
+from packaging import version
 
 from cumulusci.cli.utils import get_installed_version
 from cumulusci.core.exceptions import ConfigError, KeychainKeyNotFound, OrgNotFound
@@ -143,7 +143,7 @@ def check_cumulusci_version(self):
         if self.project_config:
             min_cci_version = self.project_config.minimum_cumulusci_version
             if min_cci_version:
-                parsed_version = pkg_resources.parse_version(min_cci_version)
+                parsed_version = version.parse(min_cci_version)
                 if get_installed_version() < parsed_version:
                     raise click.UsageError(
                         f"This project requires CumulusCI version {min_cci_version} or later. "
diff --git a/cumulusci/cli/service.py b/cumulusci/cli/service.py
@@ -83,6 +83,25 @@ def list_commands(self, ctx):
         services = self._get_services_config(runtime)
         return sorted(services.keys())
 
+    def invoke(self, ctx):
+        """Override to show available services instead of 'Missing command' error"""
+        try:
+            return super().invoke(ctx)
+        except click.UsageError as e:
+            if "Missing command" in str(e):
+                # No subcommand provided - list available services
+                services = self.list_commands(ctx)
+                if services:
+                    click.echo("Available services:")
+                    for service in services:
+                        click.echo(f"  {service}")
+                else:
+                    click.echo("No services available to configure.")
+                return
+            else:
+                # Re-raise other usage errors
+                raise
+
     def _build_param(self, attribute: str, details: dict) -> click.Option:
         required = details.get("required", False)
         default_factory: Optional[Callable] = self._get_callable_default(
@@ -267,6 +286,7 @@ def callback(*args, **kwargs):
     cls=ConnectServiceCommand,
     name="connect",
     help="Connect an external service to CumulusCI",
+    no_args_is_help=False,
 )
 def service_connect():
     pass
diff --git a/cumulusci/cli/tests/test_cci.py b/cumulusci/cli/tests/test_cci.py
@@ -8,8 +8,8 @@
 from unittest import mock
 
 import click
-import pkg_resources
 import pytest
+from packaging import version
 from requests.exceptions import ConnectionError
 from rich.console import Console
 
@@ -402,7 +402,7 @@ def test_cli():
 
 @mock.patch(
     "cumulusci.cli.cci.get_latest_final_version",
-    mock.Mock(return_value=pkg_resources.parse_version("100")),
+    mock.Mock(return_value=version.parse("100")),
 )
 def test_version(capsys):
     run_click_command(cci.version)
@@ -413,7 +413,7 @@ def test_version(capsys):
 
 @mock.patch(
     "cumulusci.cli.cci.get_latest_final_version",
-    mock.Mock(return_value=pkg_resources.parse_version("1")),
+    mock.Mock(return_value=version.parse("1")),
 )
 def test_version__latest(capsys):
     run_click_command(cci.version)
diff --git a/cumulusci/cli/tests/test_robot.py b/cumulusci/cli/tests/test_robot.py
@@ -9,19 +9,11 @@
 from .utils import run_cli_command
 
 
-class MockWorkingSet(list):
-    """Mocks a pkg_resources.workingset object
+class MockDistribution:
+    """Mocks an importlib.metadata.Distribution object"""
 
-    Basically, a list of mock packages representing all of the packages
-    installed in the current environment
-    """
-
-    def __init__(self, *package_names):
-        super().__init__()
-        for package_name in package_names:
-            pkg = mock.Mock()
-            pkg.key = package_name
-            self.append(pkg)
+    def __init__(self, name):
+        self.name = name
 
 
 def mock_Command(returncodes={}):
@@ -49,16 +41,18 @@ def run():
     return the_real_mock
 
 
-@mock.patch("cumulusci.cli.robot.pkg_resources")
-def test_is_package_installed(pkg_resources):
+@mock.patch("cumulusci.cli.robot.importlib.metadata.distribution")
+def test_is_package_installed(mock_distribution):
     """Verify that the helper _is_package_installed returns the correct result"""
-    pkg_resources.working_set = MockWorkingSet(
-        "robotframework", "robotframework-browser", "snowfakery"
-    )
+    # Test when package is installed
+    mock_distribution.return_value = MockDistribution("robotframework-browser")
     result = _is_package_installed("robotframework-browser")
     assert result is True
 
-    pkg_resources.working_set = MockWorkingSet("robotframework", "snowfakery")
+    # Test when package is not installed
+    from importlib.metadata import PackageNotFoundError
+
+    mock_distribution.side_effect = PackageNotFoundError("Package not found")
     result = _is_package_installed("robotframework-browser")
     assert result is False
 
diff --git a/cumulusci/cli/tests/test_service.py b/cumulusci/cli/tests/test_service.py
@@ -106,9 +106,10 @@ def test_service_connect__attr_with_default_value():
     # but input of an empty line accepts the default.
     assert "attr (example) [PRESET]: " in result.output
     service_config = runtime.keychain.get_service("test", "test-alias")
-    with mock.patch(
-        "cumulusci.core.config.base_config.STRICT_GETATTR", False
-    ), pytest.warns(DeprecationWarning, match="attr"):
+    with (
+        mock.patch("cumulusci.core.config.base_config.STRICT_GETATTR", False),
+        pytest.warns(DeprecationWarning, match="attr"),
+    ):
         assert service_config.lookup("attr") == "PRESET"
         assert service_config.attr == "PRESET"
 
@@ -132,9 +133,10 @@ def test_service_connect__attr_with_default_factory():
 
     # The service should have the attribute value returned by the default factory.
     service_config = runtime.keychain.get_service("test", "test-alias")
-    with mock.patch(
-        "cumulusci.core.config.base_config.STRICT_GETATTR", False
-    ), pytest.warns(DeprecationWarning, match="attr"):
+    with (
+        mock.patch("cumulusci.core.config.base_config.STRICT_GETATTR", False),
+        pytest.warns(DeprecationWarning, match="attr"),
+    ):
         assert service_config.lookup("attr") == "CALCULATED"
         assert service_config.attr == "CALCULATED"
 
@@ -155,13 +157,14 @@ def test_service_connect__alias_already_exists():
         "test-type",
         "already-exists",
         runtime=runtime,
-        input="new\ny\n",
+        input="new\ny\nn\n",
     )
 
     service_config = runtime.keychain.get_service("test-type", "already-exists")
-    with mock.patch(
-        "cumulusci.core.config.base_config.STRICT_GETATTR", False
-    ), pytest.warns(DeprecationWarning, match="attr"):
+    with (
+        mock.patch("cumulusci.core.config.base_config.STRICT_GETATTR", False),
+        pytest.warns(DeprecationWarning, match="attr"),
+    ):
         assert service_config.lookup("attr") == "new"
         assert service_config.attr == "new"
 
@@ -536,7 +539,7 @@ def test_service_connect__connected_app():
         "connect",
         "connected_app",
         "new",
-        input="\n\nID\nSECRET\n",
+        input="\n\nID\nSECRET\nn\n",
         runtime=runtime,
     )
 
@@ -559,7 +562,7 @@ def test_service_connect__connected_app__with_cli_options():
         "new",
         "--login_url",
         "https://custom",
-        input="\nID\nSECRET\n",  # not prompted for login_url
+        input="\nID\nSECRET\nn\n",  # not prompted for login_url
         runtime=runtime,
     )
 
diff --git a/cumulusci/cli/tests/test_utils.py b/cumulusci/cli/tests/test_utils.py
@@ -3,10 +3,10 @@
 import time
 from unittest import mock
 
-import pkg_resources
 import pytest
 import requests
 import responses
+from packaging import version
 
 import cumulusci
 
@@ -46,8 +46,8 @@ def test_get_latest_final_version():
 def test_check_latest_version(click, get_latest_final_version, get_installed_version):
     with utils.timestamp_file() as f:
         f.write(str(time.time() - 4000))
-    get_latest_final_version.return_value = pkg_resources.parse_version("2")
-    get_installed_version.return_value = pkg_resources.parse_version("1")
+    get_latest_final_version.return_value = version.parse("2")
+    get_installed_version.return_value = version.parse("1")
 
     utils.check_latest_version()
     if sys.version_info > utils.LOWEST_SUPPORTED_VERSION:
diff --git a/cumulusci/cli/tests/utils.py b/cumulusci/cli/tests/utils.py
@@ -17,7 +17,7 @@ def run_click_command(cmd, *args, **kw):
 
 def run_cli_command(*args, runtime=None, input=None, **kw):
     """Run a click command with arg parsing and injected CCI runtime object."""
-    runner = CliRunner(mix_stderr=False)
+    runner = CliRunner()
     result = runner.invoke(
         cli,
         args,
diff --git a/cumulusci/cli/utils.py b/cumulusci/cli/utils.py
@@ -6,8 +6,8 @@
 from collections import defaultdict
 
 import click
-import pkg_resources
 import requests
+from packaging import version as packaging_version
 from rich.console import Console
 
 from cumulusci import __version__
@@ -74,7 +74,7 @@ def get_latest_final_version():
     for versionstring in res["releases"].keys():
         if not is_final_release(versionstring):
             continue
-        versions.append(pkg_resources.parse_version(versionstring))
+        versions.append(packaging_version.parse(versionstring))
     versions.sort(reverse=True)
     return versions[0]
 
@@ -110,9 +110,14 @@ def check_latest_version():
             )
 
 
-def get_installed_version():
-    """returns the version name (e.g. 2.0.0b58) that is installed"""
-    return pkg_resources.parse_version(__version__)
+def parse_version(versionstring: str) -> packaging_version.Version:
+    """Parse a version string into a Version object."""
+    return packaging_version.parse(versionstring)
+
+
+def get_installed_version() -> packaging_version.Version:
+    """Get the installed version of CumulusCI."""
+    return parse_version(__version__)
 
 
 def win32_long_paths_enabled() -> bool:
diff --git a/cumulusci/tasks/salesforce/sourcetracking.py b/cumulusci/tasks/salesforce/sourcetracking.py
diff --git a/cumulusci/tasks/salesforce/update_profile.py b/cumulusci/tasks/salesforce/update_profile.py
diff --git a/cumulusci/tests/test_integration_infrastructure.py b/cumulusci/tests/test_integration_infrastructure.py
diff --git a/docs/history.md b/docs/history.md
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "4.4.0"`
	`1`	`+__version__ = "4.5.0"`