Skip to content

Commit a536d4e

Browse files
authored
Merge pull request #83 from cadenmyers13/fix-mtm
CI: Fix merge to main subprocess failure
2 parents 509d64d + 6a6569d commit a536d4e

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

news/fix-mtm.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* No news added.
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* <news item>
16+
17+
**Fixed:**
18+
19+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

tests/conftest.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import json
2+
import os
23
import subprocess
34
from pathlib import Path
45

@@ -10,14 +11,18 @@
1011
def conda_env(tmp_path):
1112
env_dir = tmp_path / "fake_env"
1213
env_dir_str = env_dir.as_posix()
14+
shell = os.name == "nt"
1315
subprocess.run(
1416
["conda", "create", "-y", "-p", env_dir_str],
1517
check=True,
1618
capture_output=True,
19+
shell=shell,
1720
)
1821
yield env_dir_str
1922
subprocess.run(
20-
["conda", "env", "remove", "-p", env_dir_str, "-y"], check=True
23+
["conda", "env", "remove", "-p", env_dir_str, "-y"],
24+
check=True,
25+
shell=shell,
2126
)
2227

2328

0 commit comments

Comments
 (0)