Improve terminal logic

pypa · Oct 8, 2023 · 894db4d · 894db4d
1 parent 6a1f8dc
commit 894db4d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/docs-dev.yml b/.github/workflows/docs-dev.yml
@@ -11,9 +11,6 @@ on:
 concurrency:
   group: docs-deploy
 
-env:
-  FORCE_COLOR: "1"
-
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml
@@ -9,9 +9,6 @@ on:
 concurrency:
   group: docs-deploy
 
-env:
-  FORCE_COLOR: "1"
-
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,6 @@ concurrency:
 env:
   STABLE_PYTHON_VERSION: '3.11'
   PYTHONUNBUFFERED: "1"
-  FORCE_COLOR: "1"
 
 jobs:
   run:

diff --git a/src/hatch/cli/__init__.py b/src/hatch/cli/__init__.py
@@ -102,8 +102,8 @@ def hatch(ctx: click.Context, env_name, project, verbose, quiet, color, interact
         elif os.environ.get(AppEnvVars.FORCE_COLOR) == '1':
             color = True
 
-    if interactive is None:
-        interactive = not running_in_ci()
+    if interactive is None and running_in_ci():
+        interactive = False
 
     app = Application(ctx.exit, verbose - quiet, color, interactive)
 

diff --git a/src/hatch/cli/terminal.py b/src/hatch/cli/terminal.py
@@ -136,8 +136,8 @@ def __init__(self, verbosity, enable_color, interactive):
         self.verbosity = verbosity
         self.interactive = interactive
         self.console = Console(
-            force_terminal=enable_color,
-            no_color=enable_color is False,
+            force_interactive=interactive,
+            no_color=None if enable_color is None else not enable_color,
             markup=False,
             emoji=False,
             highlight=False,