Skip to content

Commit fa915f6

Browse files
Apply suggestions from code review
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
1 parent d0f7884 commit fa915f6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

changelog/12652.bugfix.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
Resolve the regression in conda environment detection by
2-
explicitly expanding virtualenv detection to conda environents
1+
Resolve regression `conda` environments where no longer being automatically detected.
32

43
-- by :user:`RonnyPfannschmidt`

src/_pytest/main.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,10 @@ def _in_venv(path: Path) -> bool:
373373
374374
[https://peps.python.org/pep-0405/]
375375
376-
for regression protection we also check for conda environments that do not include pyenv.cfg yet
377-
https://github.com/conda/conda/issues/13337 is the conda issue tracking adding pyenv.cfg
376+
For regression protection we also check for conda environments that do not include pyenv.cfg yet --
377+
https://github.com/conda/conda/issues/13337 is the conda issue tracking adding pyenv.cfg.
378+
379+
Checking for the `conda-meta/history` file per https://github.com/pytest-dev/pytest/issues/12652#issuecomment-2246336902.
378380
379381
"""
380382
try:

0 commit comments

Comments
 (0)