Merge branch 'main' into molecule-config-file

.github/workflows/ack.yml

@@ -12,3 +12,4 @@ on:
 jobs:
   ack:
     uses: ansible/team-devtools/.github/workflows/ack.yml@main
+    secrets: inherit

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
     hooks:
       - id: codespell
   - repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 24.2.0
     hooks:
       - id: black
         language_version: python3
@@ -40,14 +40,14 @@ repos:
         language_version: python3
 
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.34.0
+    rev: v1.35.1
     hooks:
       - id: yamllint
         files: \.(yaml|yml)$
         types: [file, yaml]
         entry: yamllint --strict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.2.1"
+    rev: "v0.2.2"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

src/molecule/console.py

@@ -72,6 +72,12 @@ def should_do_markup() -> bool:
     return sys.stdout.isatty()
 
 
+# Define ANSIBLE_FORCE_COLOR if markup is enabled and another value is not
+# already given. This assures that Ansible subprocesses are still colored,
+# even if they do not run with a real TTY.
+if should_do_markup():
+    os.environ["ANSIBLE_FORCE_COLOR"] = os.environ.get("ANSIBLE_FORCE_COLOR", "1")
+
 console_options: dict[str, Any] = {"emoji": False, "theme": theme, "soft_wrap": True}
 
 console = Console(
@@ -83,9 +89,3 @@ def should_do_markup() -> bool:
 console_options_stderr = console_options.copy()
 console_options_stderr["stderr"] = True
 console_stderr: Console = Console(**console_options_stderr)
-
-# Define ANSIBLE_FORCE_COLOR if markup is enabled and another value is not
-# already given. This assures that Ansible subprocesses are still colored,
-# even if they do not run with a real TTY.
-if should_do_markup():
-    os.environ["ANSIBLE_FORCE_COLOR"] = os.environ.get("ANSIBLE_FORCE_COLOR", "1")