refactor: migrate from black+flake8+isort to ruff

Replace three separate linting/formatting tools with Ruff:
- black -> ruff format (same Black-compatible style)
- flake8 -> ruff check (E/F/W/C90 aligned with what CI historically enforced)
- isort -> ruff lint isort (same known-first-party settings)

Delete standalone .flake8 config (rules moved to pyproject.toml).
Update .pre-commit-config.yaml: replace ambv/black, flake8, isort hooks
with astral-sh/ruff-pre-commit v0.15.8. Bump pre-commit-hooks to v5.0.0.

Merge chore/prettier-v3-reformatting so Prettier and Ruff agree on formatted files.

Small lint-driven fixes: isinstance for GitHub client checks; remove redundant
EnvironmentVarGuard assignments; import Salesforce from simple_salesforce.api.

Author: jstvz

.flake8

@@ -1,27 +1,23 @@
 default_language_version:
     python: python3
 repos:
-    - repo: https://github.com/ambv/black
-      rev: 22.3.0
+    - repo: https://github.com/astral-sh/ruff-pre-commit
+      rev: v0.15.8
       hooks:
-          - id: black
+          - id: ruff
+            args: [--fix]
+          - id: ruff-format
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v2.0.0
+      rev: v5.0.0
       hooks:
           - id: check-merge-conflict
-          - id: flake8
           - id: debug-statements
             exclude: "cumulusci/(utils/logging|cli/cci|tasks/robotframework/debugger/ui|cli/task|robotframework/utils).py"
     - repo: https://github.com/Lucas-C/pre-commit-hooks-markup
       rev: v1.0.1
       hooks:
           - id: rst-linter
             exclude: "docs"
-    - repo: https://github.com/pycqa/isort
-      rev: 5.12.0
-      hooks:
-          - id: isort
-            args: ["--profile", "black", "--filter-files"]
     - repo: https://github.com/pre-commit/mirrors-prettier
       rev: v3.1.0
       hooks:

.pre-commit-config.yaml

@@ -14,5 +14,5 @@
 if sys.version_info < (3, 8):  # pragma: no cover
     raise Exception("CumulusCI requires Python 3.8+.")
 
-api.OrderedDict = dict
-bulk.OrderedDict = dict
+api.OrderedDict = dict  # pyright: ignore[reportPrivateImportUsage]
+bulk.OrderedDict = dict  # pyright: ignore[reportPrivateImportUsage]

cumulusci/__init__.py

@@ -44,9 +44,9 @@ def flow_doc(runtime, project=False):
     flows_by_group = group_items(flows)
     flow_groups = sorted(
         flows_by_group.keys(),
-        key=lambda group: flow_info_groups.index(group)
-        if group in flow_info_groups
-        else 100,
+        key=lambda group: (
+            flow_info_groups.index(group) if group in flow_info_groups else 100
+        ),
     )
 
     for group in flow_groups:

cumulusci/cli/flow.py

@@ -1,4 +1,5 @@
-""" CLI logger """
+"""CLI logger"""
+
 import logging
 import os
 import sys

cumulusci/cli/logger.py

@@ -34,6 +34,7 @@ def set_org_name(required):
 
     `required` is a boolean for whether org_name is required
     """
+
     # could be generalized to work for any mutex pair (or list) but no obvious need
     def callback(ctx, param, value):
         """Callback which enforces mutex and 'required' behaviour (if required)."""
@@ -474,7 +475,6 @@ def org_prune(runtime, include_active=False):
     org_shapes_skipped = []
     active_orgs_skipped = []
     for org_name in runtime.keychain.list_orgs():
-
         org_config = runtime.keychain.get_org(org_name)
 
         if org_name in predefined_scratch_configs:

cumulusci/cli/org.py

@@ -246,7 +246,6 @@ def init_from_context(context: Dict[str, object], echo: bool = False):
 
     # Create sfdx-project.json
     if not os.path.isfile("sfdx-project.json"):
-
         sfdx_project = {
             "packageDirectories": [{"path": "force-app", "default": True}],
             "namespace": context["package_namespace"],

cumulusci/cli/project.py

@@ -23,7 +23,7 @@ def __init__(self, *args, **kwargs):
             super(CliRuntime, self).__init__(*args, **kwargs)
         except ConfigError as e:
             raise click.UsageError(f"Config Error: {str(e)}")
-        except (KeychainKeyNotFound) as e:
+        except KeychainKeyNotFound as e:
             raise click.UsageError(f"Keychain Error: {str(e)}")
 
     def get_keychain_class(self):

cumulusci/cli/runtime.py

@@ -98,7 +98,9 @@ def test_error_gist(
         )
         webbrowser_open.assert_called_once_with(expected_gist_url)
 
-    @pytest.mark.skipif(sys.version_info > (3, 11), reason="requires python3.10 or higher")
+    @pytest.mark.skipif(
+        sys.version_info > (3, 11), reason="requires python3.10 or higher"
+    )
     @mock.patch("cumulusci.cli.error.platform")
     @mock.patch("cumulusci.cli.error.sys")
     @mock.patch("cumulusci.cli.error.datetime")

cumulusci/cli/tests/test_error.py

@@ -887,9 +887,9 @@ def get_org(orgname):
 
         run_click_command(org.org_list, runtime=runtime, json_flag=False, plain=False)
 
-        assert "Cannot load org config for `test1`" in str(
+        assert "Cannot load org config for `test1`" in str(echo.mock_calls), (
             echo.mock_calls
-        ), echo.mock_calls
+        )
         assert "NOPE!" in str(echo.mock_calls), echo.mock_calls
         assert "Cannot cleanup org cache dirs" in str(echo.mock_calls), echo.mock_calls