Merge pull request #1098 from geieredgar/switch-to-pre-commit-color-env

asottile · web-flow · commit 332b98bd86f4 · 2019-07-23T09:07:54.000-07:00
Switch from NO_COLOR to PRE_COMMIT_COLOR environment variable
diff --git a/pre_commit/color.py b/pre_commit/color.py
@@ -48,9 +48,6 @@ def use_color(setting):
     if setting not in COLOR_CHOICES:
         raise InvalidColorSetting(setting)
 
-    if os.environ.get('NO_COLOR'):
-        return False
-
     return (
         setting == 'always' or
         (setting == 'auto' and sys.stdout.isatty() and terminal_supports_color)
diff --git a/pre_commit/main.py b/pre_commit/main.py
@@ -38,7 +38,8 @@
 
 def _add_color_option(parser):
     parser.add_argument(
-        '--color', default='auto', type=color.use_color,
+        '--color', default=os.environ.get('PRE_COMMIT_COLOR', 'auto'),
+        type=color.use_color,
         metavar='{' + ','.join(color.COLOR_CHOICES) + '}',
         help='Whether to use color in output.  Defaults to `%(default)s`.',
     )
diff --git a/tests/color_test.py b/tests/color_test.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import os
 import sys
 
 import mock
@@ -51,18 +50,3 @@ def test_use_color_tty_without_color_support():
 def test_use_color_raises_if_given_shenanigans():
     with pytest.raises(InvalidColorSetting):
         use_color('herpaderp')
-
-
-def test_no_color_env_unset():
-    with mock.patch.dict(os.environ, clear=True):
-        assert use_color('always') is True
-
-
-def test_no_color_env_empty():
-    with mock.patch.dict(os.environ, NO_COLOR=''):
-        assert use_color('always') is True
-
-
-def test_no_color_env_non_empty():
-    with mock.patch.dict(os.environ, NO_COLOR=' '):
-        assert use_color('always') is False

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@`
`38`	`38`
`39`	`39`	`def _add_color_option(parser):`
`40`	`40`	`parser.add_argument(`
`41`		`- '--color', default='auto', type=color.use_color,`
	`41`	`+ '--color', default=os.environ.get('PRE_COMMIT_COLOR', 'auto'),`
	`42`	`+ type=color.use_color,`
`42`	`43`	`metavar='{' + ','.join(color.COLOR_CHOICES) + '}',`
`43`	`44`	help='Whether to use color in output. Defaults to `%(default)s`.',
`44`	`45`	`)`