cumulusci-plus 5.0.1__tar.gz → 5.0.3__tar.gz

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cumulusci-plus
-Version: 5.0.1
+Version: 5.0.3
 Summary: Build and release tools for Salesforce developers
 Project-URL: Homepage, https://github.com/SFDO-Tooling/CumulusCI
 Project-URL: Changelog, https://cumulusci.readthedocs.io/en/stable/history.html

cumulusci_plus-5.0.3/cumulusci/__about__.py

@@ -0,0 +1 @@
+__version__ = "5.0.3"

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/__init__.py

@@ -11,12 +11,18 @@ from simple_salesforce import api, bulk
 __location__ = os.path.dirname(os.path.realpath(__file__))
 
 try:
-    __version__ = version("cumulusci")
+    __version__ = version("cumulusci-plus")
 except PackageNotFoundError:
     __version__ = "unknown"
 
-if sys.version_info < (3, 8):  # pragma: no cover
-    raise Exception("CumulusCI requires Python 3.8+.")
+try:
+    version("cumulusci")
+    raise Exception("CumulusCI installation found, Remove the CumulusCI package.")
+except PackageNotFoundError:
+    pass
+
+if sys.version_info < (3, 11):  # pragma: no cover
+    raise Exception("CumulusCI requires Python 3.11+.")
 
 api.OrderedDict = dict
 bulk.OrderedDict = dict

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/cli/cci.py

@@ -14,6 +14,7 @@ from rich.markup import escape
 import cumulusci
 from cumulusci.core.debug import set_debug_mode
 from cumulusci.core.exceptions import CumulusCIUsageError
+from cumulusci.plugins.plugin_loader import load_plugins
 from cumulusci.utils import get_cci_upgrade_command
 from cumulusci.utils.http.requests_utils import init_requests_trust
 from cumulusci.utils.logging import tee_stdout_stderr
@@ -29,6 +30,7 @@ from .runtime import CliRuntime, pass_runtime
 from .service import service
 from .task import task
 from .utils import (
+    check_latest_plugins,
     check_latest_version,
     get_installed_version,
     get_latest_final_version,
@@ -63,6 +65,7 @@ def main(args=None):
         is_version_command = len(args) > 1 and args[1] == "version"
         if "--json" not in args and not is_version_command:
             check_latest_version()
+            check_latest_plugins()
 
         # Only create logfiles for commands that are not `cci error`
         is_error_command = len(args) > 2 and args[1] == "error"
@@ -152,8 +155,13 @@ def show_debug_info():
 
 def show_version_info():
     console = rich.get_console()
-    console.print(f"CumulusCI version: {cumulusci.__version__} ({sys.argv[0]})")
+    console.print(
+        f"[bold]CumulusCI Plus[/bold] version: {cumulusci.__version__} ({sys.argv[0]})"
+    )
+    show_plugin_version_infos(console)
+
     console.print(f"Python version: {sys.version.split()[0]} ({sys.executable})")
+
     console.print()
     warn_if_no_long_paths(console=console)
 
@@ -161,21 +169,36 @@ def show_version_info():
     latest_version = get_latest_final_version()
 
     if not latest_version > current_version:
-        console.print("You have the latest version of CumulusCI :sun_behind_cloud:\n")
+        console.print(
+            "You have the latest version of CumulusCI Plus :sun_behind_cloud:\n"
+        )
         display_release_notes_link(str(latest_version))
         return
 
     console.print(
-        f"[yellow]There is a newer version of CumulusCI available: {str(latest_version)}"
+        f"[yellow]There is a newer version of CumulusCI Plus available: {str(latest_version)}"
     )
     console.print(f"To upgrade, run `{get_cci_upgrade_command()}`")
     display_release_notes_link(str(latest_version))
 
 
+def show_plugin_version_infos(console: Console):
+    """Display version information for all loaded plugins."""
+    console.print("Loaded plugins:")
+    plugins = load_plugins()
+    for plugin in plugins:
+        try:
+            console.print(f"  [bold]{plugin.name}[/bold]: {plugin.version}")
+        except Exception as e:
+            console.print(
+                f"  [bold]{plugin.name}[/bold]: [red]Error retrieving version: {e}[/red]"
+            )
+
+
 def display_release_notes_link(latest_version: str) -> None:
     """Provide a link to the latest CumulusCI Release Notes"""
     release_notes_link = (
-        f"https://github.com/SFDO-Tooling/CumulusCI/releases/tag/v{latest_version}"
+        f"https://github.com/jorgesolebur/CumulusCI/releases/tag/v{latest_version}"
     )
     console = rich.get_console()
     console.print(

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/cli/runtime.py

@@ -146,7 +146,7 @@ class CliRuntime(BaseCumulusCI):
                 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. "
+                        f"This project requires CumulusCI Plus version {min_cci_version} or later. "
                         f"To upgrade, please run this command: {get_cci_upgrade_command()}"
                     )
 

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/cli/tests/test_cci.py

@@ -407,8 +407,8 @@ def test_cli():
 def test_version(capsys):
     run_click_command(cci.version)
     console_output = capsys.readouterr().out
-    assert f"CumulusCI version: {cumulusci.__version__}" in console_output
-    assert "There is a newer version of CumulusCI available" in console_output
+    assert f"CumulusCI Plus version: {cumulusci.__version__}" in console_output
+    assert "There is a newer version of CumulusCI Plus available" in console_output
 
 
 @mock.patch(

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/cli/utils.py

@@ -13,10 +13,11 @@ from rich.console import Console
 
 from cumulusci import __version__
 from cumulusci.core.config import UniversalConfig
+from cumulusci.plugins.plugin_loader import load_plugins
 from cumulusci.utils import get_cci_upgrade_command
 from cumulusci.utils.http.requests_utils import safe_json_from_response
 
-LOWEST_SUPPORTED_VERSION = (3, 8, 0)
+LOWEST_SUPPORTED_VERSION = (3, 11, 0)
 WIN_LONG_PATH_WARNING = """
 WARNING: Long path support is not enabled. This can lead to errors with some
 tasks. Your administrator will need to activate the "Enable Win32 long paths"
@@ -67,13 +68,15 @@ def is_final_release(version: str) -> bool:
     return bool(FINAL_VERSION_RE.match(version))
 
 
-def get_latest_final_version():
+def get_latest_final_version(
+    pkg="cumulusci-plus", tstamp_file="cumulus_timestamp"
+) -> packaging_version.Version:
     """return the latest version of cumulusci in pypi, be defensive"""
     # use the pypi json api https://wiki.python.org/moin/PyPIJSON
     res = safe_json_from_response(
-        requests.get("https://pypi.org/pypi/cumulusci-plus/json", timeout=5)
+        requests.get(f"https://pypi.org/pypi/{pkg}/json", timeout=5)
     )
-    with timestamp_file() as f:
+    with timestamp_file(timestamp_file=tstamp_file) as f:
         f.write(str(time.time()))
     versions = []
     for versionstring in res["releases"].keys():
@@ -84,33 +87,38 @@ def get_latest_final_version():
     return versions[0]
 
 
-def check_latest_version():
+def check_latest_version(
+    pkg="cumulusci-plus",
+    installed_version=None,
+    tstamp_file="cumulus_timestamp",
+    message=f"""An update to CumulusCI is available. To install the update, run this command: {get_cci_upgrade_command()}""",
+):
     """checks for the latest version of cumulusci from pypi, max once per hour"""
     check = True
 
-    with timestamp_file() as f:
+    with timestamp_file(timestamp_file=tstamp_file) as f:
         timestamp = float(f.read() or 0)
     delta = time.time() - timestamp
     check = delta > 3600
 
     if check:
         try:
-            latest_version = get_latest_final_version()
+            latest_version = get_latest_final_version(pkg, tstamp_file)
         except requests.exceptions.RequestException as e:
             click.echo("Error checking cci version:", err=True)
             click.echo(str(e), err=True)
             return
 
-        result = latest_version > get_installed_version()
+        result = latest_version > (installed_version or get_installed_version())
         if result:
             click.echo(
-                f"""An update to CumulusCI is available. To install the update, run this command: {get_cci_upgrade_command()}""",
+                message,
                 err=True,
             )
 
         if sys.version_info < LOWEST_SUPPORTED_VERSION:
             click.echo(
-                "Sorry! Your Python version is not supported. Please upgrade to Python 3.9.",
+                "Sorry! Your Python version is not supported. Please upgrade to Python 3.11.",
                 err=True,
             )
 
@@ -148,3 +156,14 @@ def warn_if_no_long_paths(console: Console = Console()) -> None:
     """Print a warning to the user if long paths are not enabled."""
     if sys.platform.startswith("win") and not win32_long_paths_enabled():
         console.print(WIN_LONG_PATH_WARNING)
+
+
+def check_latest_plugins():
+    plugins = load_plugins()
+    for plugin in plugins:
+        try:
+            plugin.check_latest_version()
+        except Exception as e:
+            click.echo(
+                f"Error checking latest version for plugin {plugin.name}: {e}", err=True
+            )

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/core/config/project_config.py

@@ -185,7 +185,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
                 self.config_additional_yaml.update(additional_yaml_config)
 
         # Loading plugins as classes are loaded and available.
-        plugins = load_plugins(self.logger)
+        plugins = load_plugins()
 
         # Load the plugin yaml config file if it exists
         for plugin in plugins:

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/plugins/plugin_base.py

@@ -15,7 +15,7 @@ class PluginBase(ABC):
     plugin_project_config: Optional[dict] = None
 
     def __init__(self, **kwargs) -> None:
-        self.logger = kwargs.get("logger", logging.getLogger(self.__class__.__name__))
+        self.logger = kwargs.get("logger", logging.getLogger(__name__))
         self.path = inspect.getfile(self.__class__)
         self._load_config()
 
@@ -91,3 +91,8 @@ class PluginBase(ABC):
     def _initialize(self) -> None:
         """Override this method to add custom initialization logic."""
         pass
+
+    def check_latest_version(self):
+        """Override this method to check for the latest version of the plugin."""
+        # Implement logic to check for the latest version if needed
+        pass

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/plugins/plugin_loader.py

@@ -5,20 +5,22 @@ from typing import Dict, List, Optional, Type
 
 from cumulusci.plugins.plugin_base import PluginBase
 
+logger: logging.Logger = logging.getLogger(__name__)
 
-def get_plugin_manager(logger: logging.Logger) -> "PluginManager":
+
+def get_plugin_manager() -> "PluginManager":
     """Get the plugin manager instance."""
-    return PluginManager(logger=logger)
+    return PluginManager()
 
 
 @lru_cache(maxsize=50)
-def load_plugins(logger: logging.Logger) -> List[PluginBase]:
+def load_plugins() -> List[PluginBase]:
     """Load all available plugins and return them as a list."""
-    manager = get_plugin_manager(logger)
+    manager = get_plugin_manager()
     plugins = []
     for name, plugin_class in manager._plugins.items():
         try:
-            plugin = plugin_class(logger=logger)
+            plugin = plugin_class()
             plugin.initialize()
             plugins.append(plugin)
         except Exception as e:
@@ -29,9 +31,9 @@ def load_plugins(logger: logging.Logger) -> List[PluginBase]:
 class PluginManager:
     """Manages the loading and access of CumulusCI plugins."""
 
-    def __init__(self, logger: logging.Logger) -> None:
+    def __init__(self) -> None:
         self._plugins: Dict[str, Type[PluginBase]] = {}
-        self.logger = logger
+        self.logger = logging.getLogger(__name__)
         self._load_plugins()
 
     def _load_plugins(self) -> None:

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/utils/__init__.py

@@ -38,10 +38,10 @@ BREW_DEPRECATION_MSG = (
     "It looks like you have installed CumulusCI using brew."
     "This method of installation is no longer supported."
     "Please use the following to install CumulusCI with pipx:\n"
-    "brew uninstall cumulusci\nbrew install pipx\npipx ensurepath\npipx install cumulusci"
+    "brew uninstall cumulusci-plus\nbrew install pipx\npipx ensurepath\npipx install cumulusci-plus"
 )
-PIP_UPDATE_CMD = "pip install --upgrade cumulusci"
-PIPX_UPDATE_CMD = "pipx upgrade cumulusci"
+PIP_UPDATE_CMD = "pip install --upgrade cumulusci-plus"
+PIPX_UPDATE_CMD = "pipx upgrade cumulusci-plus"
 
 
 def parse_api_datetime(value):

{cumulusci_plus-5.0.1 → cumulusci_plus-5.0.3}/cumulusci/utils/yaml/cumulusci_yml.py

@@ -183,13 +183,8 @@ class Plugin(CCIDictModel):
 
     @root_validator()
     def _check_name_version(cls, values):
-        has_name = values.get("name") is not None
-        has_version = values.get("version") is not None
-
-        # If one is defined, both should be defined
-        if (has_name and not has_version) or (has_version and not has_name):
-            raise ValueError("Plugin Name and Version must be defined.")
-
+        if values.get("name") is None:
+            raise ValueError("Plugin Name must be defined.")
         return values
 
 

cumulusci_plus-5.0.1/cumulusci/__about__.py

@@ -1 +0,0 @@
-__version__ = "5.0.1"