Skip to content

Commit 13139cb

Browse files
authored
Merge pull request #12415 from mgorny/no-color
2 parents 0ad4c94 + 1836651 commit 13139cb

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ on:
1111
schedule:
1212
- cron: 0 0 * * MON # Run every Monday at 00:00 UTC
1313

14+
env:
15+
# The "FORCE_COLOR" variable, when set to 1,
16+
# tells Nox to colorize itself.
17+
FORCE_COLOR: "1"
18+
1419
concurrency:
1520
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
1621
cancel-in-progress: true

news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst

Whitespace-only changes.

tests/conftest.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@ def isolate(tmpdir: Path, monkeypatch: pytest.MonkeyPatch) -> None:
318318
# Make sure tests don't share a requirements tracker.
319319
monkeypatch.delenv("PIP_BUILD_TRACKER", False)
320320

321+
# Make sure color control variables don't affect internal output.
322+
monkeypatch.delenv("FORCE_COLOR", False)
323+
monkeypatch.delenv("NO_COLOR", False)
324+
321325
# FIXME: Windows...
322326
os.makedirs(os.path.join(home_dir, ".config", "git"))
323327
with open(os.path.join(home_dir, ".config", "git", "config"), "wb") as fp:

tests/functional/test_inspect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from tests.lib import PipTestEnvironment, ScriptFactory, TestData
66

77

8-
@pytest.fixture(scope="session")
8+
@pytest.fixture
99
def simple_script(
1010
tmpdir_factory: pytest.TempPathFactory,
1111
script_factory: ScriptFactory,

0 commit comments

Comments
 (0)