cumulusci 3.68.0__tar.gz → 3.68.0.dev2__tar.gz

{cumulusci-3.68.0 → cumulusci-3.68.0.dev2}/HISTORY.rst

@@ -2,29 +2,6 @@
 History
 =======
 
-3.68.0 (2022-10-31)
--------------------
-
-Critical Changes 🎉
-
--  Upgraded Robot Framework from version 4.1.3 to version 6. As with most Robot Framework updates, there are a host of new features and a few deprecated features and backwards incompatibilities. For a complete list consult the `Robot Framework release notes <https://github.com/robotframework/robotframework/releases>`__ in https://github.com/SFDO-Tooling/CumulusCI/pull/3417
-
-Changes 🎉
-
--  Add support for InstallKey, sourceOrg, release keys on 2GP version create by @davidmreed in https://github.com/SFDO-Tooling/CumulusCI/pull/3403
--  We now support the ``Territory2``, ``Territory2Model``, ``Territory2Type``, and ``Territory2Rule`` MetaData types. by @TheBitShepherd in https://github.com/SFDO-Tooling/CumulusCI/pull/3406
--  Add ``push_upgrade_org`` flow to test in simulated push upgrade environment by @davidmreed in https://github.com/SFDO-Tooling/CumulusCI/pull/3286
--  Fixed bug preventing the ``deploy_omni_studio_site_settings`` task from deploying to scratch orgs with the new ``.scratch.`` domain names by @jofsky in https://github.com/SFDO-Tooling/CumulusCI/pull/3411
--  All new keychain details are serialized using JSON, not pickle by @bethbrains in https://github.com/SFDO-Tooling/CumulusCI/pull/3390
-- Snowfakery (upgraded to 3.4) can now generate Event or Meeting Schedules similar to Calendar Apps
-- Snowfakery now has a Salesforce.ContentFile feature for generating Content Versions
-
-Issues Fixed 🩴
-
--  Bumped key_size from 2048 to 4096 on advice from a security audit by @boakley in https://github.com/SFDO-Tooling/CumulusCI/pull/3389
--  Fixed an issue where unknown deploy statuses could cause polling to hang in the deploy_marketing_cloud_package task by @TheBitShepherd in https://github.com/SFDO-Tooling/CumulusCI/pull/3394
--  Fixed an injection vulnerability related to unquoted csv writers by @TheBitShepherd in https://github.com/SFDO-Tooling/CumulusCI/pull/3404
-
 3.66.0 (2022-09-29)
 -------------------
 

{cumulusci-3.68.0 → cumulusci-3.68.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cumulusci
-Version: 3.68.0
+Version: 3.68.0.dev2
 Summary: Build and release tools for Salesforce developers
 Home-page: https://github.com/SFDO-Tooling/CumulusCI
 Author: Salesforce.org
@@ -66,29 +66,6 @@ Description: =========
         History
         =======
         
-        3.68.0 (2022-10-31)
-        -------------------
-        
-        Critical Changes 🎉
-        
-        -  Upgraded Robot Framework from version 4.1.3 to version 6. As with most Robot Framework updates, there are a host of new features and a few deprecated features and backwards incompatibilities. For a complete list consult the `Robot Framework release notes <https://github.com/robotframework/robotframework/releases>`__ in https://github.com/SFDO-Tooling/CumulusCI/pull/3417
-        
-        Changes 🎉
-        
-        -  Add support for InstallKey, sourceOrg, release keys on 2GP version create by @davidmreed in https://github.com/SFDO-Tooling/CumulusCI/pull/3403
-        -  We now support the ``Territory2``, ``Territory2Model``, ``Territory2Type``, and ``Territory2Rule`` MetaData types. by @TheBitShepherd in https://github.com/SFDO-Tooling/CumulusCI/pull/3406
-        -  Add ``push_upgrade_org`` flow to test in simulated push upgrade environment by @davidmreed in https://github.com/SFDO-Tooling/CumulusCI/pull/3286
-        -  Fixed bug preventing the ``deploy_omni_studio_site_settings`` task from deploying to scratch orgs with the new ``.scratch.`` domain names by @jofsky in https://github.com/SFDO-Tooling/CumulusCI/pull/3411
-        -  All new keychain details are serialized using JSON, not pickle by @bethbrains in https://github.com/SFDO-Tooling/CumulusCI/pull/3390
-        - Snowfakery (upgraded to 3.4) can now generate Event or Meeting Schedules similar to Calendar Apps
-        - Snowfakery now has a Salesforce.ContentFile feature for generating Content Versions
-        
-        Issues Fixed 🩴
-        
-        -  Bumped key_size from 2048 to 4096 on advice from a security audit by @boakley in https://github.com/SFDO-Tooling/CumulusCI/pull/3389
-        -  Fixed an issue where unknown deploy statuses could cause polling to hang in the deploy_marketing_cloud_package task by @TheBitShepherd in https://github.com/SFDO-Tooling/CumulusCI/pull/3394
-        -  Fixed an injection vulnerability related to unquoted csv writers by @TheBitShepherd in https://github.com/SFDO-Tooling/CumulusCI/pull/3404
-        
         3.66.0 (2022-09-29)
         -------------------
         

{cumulusci-3.68.0 → cumulusci-3.68.0.dev2}/cumulusci/core/config/base_config.py

@@ -1,10 +1,8 @@
-import json
 import logging
 import os
+import typing as T
 import warnings
-from datetime import date, datetime
 from functools import lru_cache
-from typing import Any, Dict, Optional
 
 # turn on strictness.
 # delete this when strictness is mandatory
@@ -12,21 +10,13 @@ STRICT_GETATTR = os.environ.get("STRICT_GETATTR")
 CHECK_CONFIG_TYPES = os.environ.get("CHECK_CONFIG_TYPES")
 
 
-def load_dates(x):
-    if isinstance(x, datetime):
-        return {"$type": "datetime", "$value": x.isoformat()}
-    elif isinstance(x, date):
-        return {"$type": "date", "$value": x.isoformat()}
-
-
-class BaseConfig:
+class BaseConfig(object):
     """BaseConfig provides a common interface for nested access for all Config objects in CCI."""
 
     defaults = {}
     config: dict
-    logger: logging.Logger
 
-    def __init__(self, config: Optional[dict] = None, keychain=None):
+    def __init__(self, config=None, keychain=None):
         if config is None:
             self.config = {}
         else:
@@ -53,15 +43,12 @@ class BaseConfig:
         """Subclasses may override this method to initialize :py:attr:`~config`"""
         pass
 
-    def _serialize(self) -> bytes:
-        return json.dumps(self.config, default=load_dates).encode("utf-8")
-
     @classmethod
-    def _allowed_names(cls) -> Dict[str, type]:
+    def _allowed_names(cls) -> T.Dict[str, type]:
         return getattr(cls, "__annotations__", {})
 
     # long term plan is to get rid of this
-    def __getattr__(self, name: str) -> Any:
+    def __getattr__(self, name):
         """Look up a property in a sub-dictionary
 
         Property names should be declared in each Config class with type annotations.
@@ -83,10 +70,10 @@ class BaseConfig:
 
     @classmethod
     @lru_cache
-    def _all_allowed_names(cls) -> Dict[str, type]:
+    def _all_allowed_names(cls):
         "Allowed names from this class and its base classes"
         allowed_names_from_all_base_classes = (
-            baseclass._allowed_names()  # type: ignore
+            baseclass._allowed_names()
             for baseclass in cls.__mro__
             if hasattr(baseclass, "_allowed_names")
         )
@@ -95,13 +82,11 @@ class BaseConfig:
             ret.update(d)
         return ret
 
-    def lookup(
-        self, name: str, default: Any = None, already_called_getattr: bool = False
-    ) -> Any:
+    def lookup(self, name, default=None, already_called_getattr=False):
         tree = name.split("__")
         if name.startswith("_"):
             raise AttributeError(f"Attribute {name} not found")
-        value: Any = None
+        value = None
         value_found = False
         config = self.config
         if len(tree) > 1:

{cumulusci-3.68.0 → cumulusci-3.68.0.dev2}/cumulusci/core/config/project_config.py

@@ -8,9 +8,8 @@ from distutils.version import LooseVersion
 from io import StringIO
 from itertools import chain
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Dict, Iterable, Optional, Union
+from typing import Optional, Union
 
-from github3 import GitHub
 from github3.repos.repo import Repository
 
 from cumulusci.core.config.base_config import BaseConfig
@@ -21,8 +20,7 @@ API_VERSION_RE = re.compile(r"^\d\d+\.0$")
 import github3
 from pydantic import ValidationError
 
-from cumulusci.core.config import FlowConfig, TaskConfig
-from cumulusci.core.config.base_task_flow_config import BaseTaskFlowConfig
+from cumulusci.core.config import BaseTaskFlowConfig
 from cumulusci.core.exceptions import (
     ConfigError,
     GithubException,
@@ -38,7 +36,7 @@ from cumulusci.core.github import (
 )
 from cumulusci.core.source import GitHubSource, LocalFolderSource, NullSource
 from cumulusci.core.utils import merge_config
-from cumulusci.utils.fileutils import FSResource, open_fs_resource
+from cumulusci.utils.fileutils import open_fs_resource
 from cumulusci.utils.git import current_branch, git_path, parse_repo_url, split_repo_url
 from cumulusci.utils.yaml.cumulusci_yml import (
     GitHubSourceModel,
@@ -46,10 +44,6 @@ from cumulusci.utils.yaml.cumulusci_yml import (
     cci_safe_load,
 )
 
-if TYPE_CHECKING:
-    from cumulusci.core.config.universal_config import UniversalConfig
-    from cumulusci.core.keychain.base_project_keychain import BaseProjectKeychain
-
 
 class ProjectConfigPropertiesMixin(BaseConfig):
     """Mixin for shared properties used by ProjectConfigs and UniversalConfigs"""
@@ -71,26 +65,9 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
     """Base class for a project's configuration which extends the global config"""
 
     config_filename = "cumulusci.yml"
-    universal_config_obj: "UniversalConfig"
-    keychain: Optional["BaseProjectKeychain"]
-    _repo_info: Dict[str, Any]
-    config_project: dict
-    config_project_local: dict
-    config_additional_yaml: dict
-    additional_yaml: Optional[str]
-    source: Union[NullSource, GitHubSource, LocalFolderSource]
-    _cache_dir: Optional[Path]
-    included_sources: Dict[
-        Union[GitHubSourceModel, LocalFolderSourceModel], "BaseProjectConfig"
-    ]
 
     def __init__(
-        self,
-        universal_config_obj: "UniversalConfig",
-        config: Optional[dict] = None,
-        cache_dir: Optional[Path] = None,
-        *args,
-        **kwargs,
+        self, universal_config_obj, config=None, cache_dir=None, *args, **kwargs
     ):
         self.universal_config_obj = universal_config_obj
         self.keychain = None
@@ -108,8 +85,6 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
 
         # optionally pass in a kwarg named 'additional_yaml' that will
         # be added to the YAML merge stack.
-        # Called from MetaCI in metaci/cumulusci/config.py
-        # https://github.com/SFDO-Tooling/MetaCI/blob/36a0f4654/metaci/cumulusci/config.py#L8-L11
         self.additional_yaml = None
         if "additional_yaml" in kwargs:
             self.additional_yaml = kwargs.pop("additional_yaml")
@@ -121,10 +96,10 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         # Store requested cache directory, which may be our parent's if we are a subproject
         self._cache_dir = cache_dir
 
-        super().__init__(config=config)
+        super(BaseProjectConfig, self).__init__(config=config)
 
     @property
-    def config_project_local_path(self) -> Optional[str]:
+    def config_project_local_path(self):
         path = Path(self.project_local_dir) / self.config_filename
         if path.is_file():
             return str(path)
@@ -200,20 +175,20 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             raise ConfigError(message)
 
     @property
-    def config_global(self) -> dict:
+    def config_global(self):
         return self.universal_config_obj.config_global
 
     @property
-    def config_universal(self) -> dict:
+    def config_universal(self):
         return self.universal_config_obj.config_universal
 
     @property
-    def repo_info(self) -> Dict[str, Any]:
+    def repo_info(self):
         if self._repo_info is not None:
             return self._repo_info
 
         # Detect if we are running in a CI environment and get repo info
-        # from env vars for the environment instead of .git files
+        # from env vars for the enviornment instead of .git files
         info = {"ci": None}
 
         # Make sure that the CUMULUSCI_AUTO_DETECT environment variable is
@@ -245,7 +220,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         self._repo_info = info
         return self._repo_info
 
-    def _apply_repo_env_var_overrides(self, info: Dict[str, Any]):
+    def _apply_repo_env_var_overrides(self, info):
         """Apply CUMULUSCI_REPO_* environment variables last so they can
         override and fill in missing values from the CI environment"""
         self._override_repo_env_var("CUMULUSCI_REPO_BRANCH", "branch", info)
@@ -264,18 +239,14 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             url_info["url"] = repo_url
             info.update(url_info)
 
-    def _override_repo_env_var(
-        self, repo_env_var: str, local_var: str, info: Dict[str, Any]
-    ):
-        env_value: Optional[str] = os.environ.get(repo_env_var)
-        if env_value:
-            if env_value != info.get(local_var):
-                self.logger.info(
-                    f"{repo_env_var} found, using its value for configuration."
-                )
-            info[local_var] = env_value
+    def _override_repo_env_var(self, repo_env_var, local_var, info):
+        repo_env_var = os.environ.get(repo_env_var)
+        if repo_env_var:
+            if repo_env_var != info.get(local_var):
+                self.logger.info("{} found, using its value for configuration.")
+            info[local_var] = repo_env_var
 
-    def _validate_required_git_info(self, info: Dict[str, Any]):
+    def _validate_required_git_info(self, info):
         """Ensures that we have the required git info or throw a ConfigError"""
         validate = {
             # <key>: <env var to manually override>
@@ -294,7 +265,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
                     message += f" with the {env_var} environment variable."
                 raise ConfigError(message)
 
-    def _log_detected_overrides_as_warning(self, info: Dict[str, Any]):
+    def _log_detected_overrides_as_warning(self, info):
         self.logger.info("")
         self.logger.warning("Using environment variables to override repo info:")
         keys = list(info.keys())
@@ -303,7 +274,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             self.logger.warning(f"  {key}: {info[key]}")
         self.logger.info("")
 
-    def git_config_remote_origin_url(self) -> Optional[str]:
+    def git_config_remote_origin_url(self):
         """Returns the url under the [remote origin]
         section of the .git/config file. Returns None
         if .git/config file not present or no matching
@@ -317,7 +288,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         return url
 
     @property
-    def repo_root(self) -> Optional[str]:
+    def repo_root(self):
         path = self.repo_info.get("root")
         if path:
             return path
@@ -343,7 +314,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             return parse_repo_url(url_line)[2]
 
     @property
-    def repo_name(self) -> Optional[str]:
+    def repo_name(self):
         name = self.repo_info.get("name")
         if name:
             return name
@@ -356,7 +327,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             return split_repo_url(url_line)[1]
 
     @property
-    def repo_url(self) -> Optional[str]:
+    def repo_url(self):
         url = self.repo_info.get("url")
         if url:
             return url
@@ -368,7 +339,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         return url
 
     @property
-    def repo_owner(self) -> Optional[str]:
+    def repo_owner(self):
         owner = self.repo_info.get("owner")
         if owner:
             return owner
@@ -382,7 +353,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             return split_repo_url(url_line)[0]
 
     @property
-    def repo_branch(self) -> Optional[str]:
+    def repo_branch(self):
         branch = self.repo_info.get("branch")
         if branch:
             return branch
@@ -393,7 +364,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         return current_branch(self.repo_root)
 
     @property
-    def repo_commit(self) -> Optional[str]:
+    def repo_commit(self):
         commit = self.repo_info.get("commit")
         if commit:
             return commit
@@ -427,10 +398,10 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
                         ):
                             return parts[0]
 
-    def get_github_api(self, url: Optional[str] = None) -> GitHub:
+    def get_github_api(self, url=None):
         return get_github_api_for_repo(self.keychain, url or self.repo_url)
 
-    def get_repo(self) -> Repository:
+    def get_repo(self):
         repo = self.get_github_api(self.repo_url).repository(
             self.repo_owner, self.repo_name
         )
@@ -441,7 +412,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         return repo
 
     # TODO: These methods are duplicative with `find_latest_release()`
-    def get_latest_tag(self, beta: bool = False) -> str:
+    def get_latest_tag(self, beta=False):
         """Query Github Releases to find the latest production or beta tag"""
         repo = self.get_repo()
         if not beta:
@@ -456,7 +427,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         else:
             return self._get_latest_tag_for_prefix(repo, self.project__git__prefix_beta)
 
-    def _get_latest_tag_for_prefix(self, repo: Repository, prefix: str) -> str:
+    def _get_latest_tag_for_prefix(self, repo, prefix):
         for release in repo.releases():
             if not release.tag_name.startswith(prefix):
                 continue
@@ -465,14 +436,14 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             f"No release found for {self.repo_url} with tag prefix {prefix}"
         )
 
-    def get_latest_version(self, beta: bool = False) -> Optional[LooseVersion]:
+    def get_latest_version(self, beta=False):
         """Query Github Releases to find the latest production or beta release"""
         tag = self.get_latest_tag(beta)
         version = self.get_version_for_tag(tag)
         if version is not None:
             return LooseVersion(version)
 
-    def get_previous_version(self) -> Optional[LooseVersion]:
+    def get_previous_version(self):
         """Query GitHub releases to find the previous production release"""
         repo = self.get_repo()
         release = find_previous_release(repo, self.project__git__prefix_release)
@@ -480,7 +451,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             return LooseVersion(self.get_version_for_tag(release.tag_name))
 
     @property
-    def config_project_path(self) -> Optional[str]:
+    def config_project_path(self):
         if not self.repo_root:
             return
         path = Path(self.repo_root) / self.config_filename
@@ -488,7 +459,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             return str(path)
 
     @property
-    def project_local_dir(self) -> str:
+    def project_local_dir(self):
         """location of the user local directory for the project
         e.g., ~/.cumulusci/NPSP-Extension-Test/"""
 
@@ -505,7 +476,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         return path
 
     @property
-    def default_package_path(self) -> Path:
+    def default_package_path(self):
         if self.project__source_format == "sfdx":
             relpath = "force-app"
             for pkg in self.sfdx_project_config.get("packageDirectories", []):
@@ -516,26 +487,21 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         return Path(self.repo_root, relpath).resolve()
 
     @property
-    def sfdx_project_config(self) -> Dict[str, Any]:
+    def sfdx_project_config(self):
         with open(
             Path(self.repo_root) / "sfdx-project.json", "r", encoding="utf-8"
         ) as f:
             config = json.load(f)
         return config
 
-    def get_tag_for_version(self, prefix: str, version: str) -> str:
+    def get_tag_for_version(self, prefix, version):
         """Given a prefix and version, returns the appropriate tag name to use."""
         try:
             return PackageVersionNumber.parse(version).format_tag(prefix)
         except ValueError:
             return f"{prefix}{version}"
 
-    def get_version_for_tag(
-        self,
-        tag: str,
-        prefix_beta: Optional[str] = None,
-        prefix_release: Optional[str] = None,
-    ) -> Optional[str]:
+    def get_version_for_tag(self, tag, prefix_beta=None, prefix_release=None):
         try:
             return PackageVersionNumber.parse_tag(
                 tag,
@@ -545,7 +511,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         except ValueError:
             pass
 
-    def set_keychain(self, keychain: "BaseProjectKeychain"):
+    def set_keychain(self, keychain):
         self.keychain = keychain
 
     def _check_keychain(self):
@@ -556,11 +522,11 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             )
 
     @catch_common_github_auth_errors
-    def get_repo_from_url(self, url: str) -> Optional[Repository]:
+    def get_repo_from_url(self, url) -> Optional[Repository]:
         owner, name = split_repo_url(url)
         return self.get_github_api(url).repository(owner, name)
 
-    def get_task(self, name: str) -> TaskConfig:
+    def get_task(self, name):
         """Get a TaskConfig by task name
 
         If the name has a colon, look for it in a different project config.
@@ -575,7 +541,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             task_config.project_config = self
         return task_config
 
-    def get_flow(self, name) -> FlowConfig:
+    def get_flow(self, name):
         """Get a FlowConfig by flow name
 
         If the name has a colon, look for it in a different project config.
@@ -592,7 +558,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             flow_config.project_config = self
         return flow_config
 
-    def get_namespace(self, ns: str) -> "BaseProjectConfig":
+    def get_namespace(self, ns: str):
         """Look up another project config by its name in the `sources` config.
 
         Also makes sure the project has been fetched, if it's from an external source.
@@ -605,7 +571,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
 
     def include_source(
         self, spec: Union[GitHubSourceModel, LocalFolderSourceModel, dict]
-    ) -> "BaseProjectConfig":
+    ):
         """Make sure a project has been fetched from its source.
 
         This either fetches the project code and constructs its project config,
@@ -643,7 +609,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
 
         return project_config
 
-    def construct_subproject_config(self, **kwargs) -> "BaseProjectConfig":
+    def construct_subproject_config(self, **kwargs):
         """Construct another project config for an external source"""
         return self.__class__(
             self.universal_config_obj,
@@ -652,12 +618,12 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
             **kwargs,
         )
 
-    def relpath(self, path: str) -> str:
+    def relpath(self, path):
         """Convert path to be relative to the project repo root."""
         return os.path.relpath(os.path.join(self.repo_root, path))
 
     @property
-    def cache_dir(self) -> Path:
+    def cache_dir(self):
         "A project cache which is on the local filesystem. Prefer open_cache where possible."
         if self._cache_dir:
             return self._cache_dir
@@ -669,7 +635,7 @@ class BaseProjectConfig(BaseTaskFlowConfig, ProjectConfigPropertiesMixin):
         return cache_dir
 
     @contextmanager
-    def open_cache(self, cache_name: str) -> Iterable[FSResource]:
+    def open_cache(self, cache_name):
         "A context managed PyFilesystem-based cache which could theoretically be on any filesystem."
         with open_fs_resource(self.cache_dir / cache_name) as cache_dir:
             cache_dir.mkdir(exist_ok=True, parents=True)

{cumulusci-3.68.0 → cumulusci-3.68.0.dev2}/cumulusci/core/github.py

@@ -108,7 +108,7 @@ def _determine_github_client(host: str, client_params: dict) -> GitHub:
     return client_cls(**params)
 
 
-def get_github_api_for_repo(keychain, repo_url, session=None) -> GitHub:
+def get_github_api_for_repo(keychain, repo_url, session=None):
     owner, repo_name, host = parse_repo_url(repo_url)
     gh: GitHub = _determine_github_client(
         host,