Skip to content

Commit dd99e4b

Browse files
authored
Merge pull request conda#8050 from msarahan/disable_pip_interop_default
disable pip interop functionality by default due to speed concerns
2 parents 50fd668 + 2640ce7 commit dd99e4b

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

conda/base/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class Context(Configuration):
120120
force_32bit = PrimitiveParameter(False)
121121
non_admin_enabled = PrimitiveParameter(True)
122122

123-
pip_interop_enabled = PrimitiveParameter(True)
123+
pip_interop_enabled = PrimitiveParameter(False)
124124

125125
# Safety & Security
126126
_aggressive_update_packages = SequenceParameter(string_types,

tests/core/test_path_actions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def test_CompileMultiPycAction_generic(self):
107107
axns = CompileMultiPycAction.create_actions({}, package_info, self.prefix, None, ())
108108
assert axns == ()
109109

110+
@pytest.mark.xfail(on_win, reason="pyc compilation need env on windows, see gh #8025")
110111
def test_CompileMultiPycAction_noarch_python(self):
111112
if not softlink_supported(__file__, self.prefix) and on_win:
112113
pytest.skip("softlink not supported")

tests/core/test_prefix_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,4 @@ def test_get_conda_anchor_files_and_records():
162162
expected_output[valid_tests[i]] = records[i]
163163

164164
_print_output(output, expected_output)
165-
assert output, expected_output
165+
assert output, expected_output

tests/test_create.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,6 +1339,7 @@ def test_packages_not_found(self):
13391339

13401340
def test_conda_pip_interop_dependency_satisfied_by_pip(self):
13411341
with make_temp_env("python") as prefix:
1342+
run_command(Commands.CONFIG, prefix, "--set pip_interop_enabled true")
13421343
check_call(PYTHON_BINARY + " -m pip install itsdangerous",
13431344
cwd=prefix, shell=True)
13441345

@@ -1368,6 +1369,7 @@ def test_conda_pip_interop_pip_clobbers_conda(self):
13681369
# 3. conda list shows new six and deletes old conda record
13691370
# 4. probably need to purge something with the history file too?
13701371
with make_temp_env("six=1.9 pip=9.0.3 python=3.5") as prefix:
1372+
run_command(Commands.CONFIG, prefix, "--set pip_interop_enabled true")
13711373
assert package_is_installed(prefix, "six=1.9.0")
13721374
assert package_is_installed(prefix, "python=3.5")
13731375
output = check_output(PYTHON_BINARY + " -m pip freeze", cwd=prefix, shell=True)
@@ -1517,6 +1519,7 @@ def test_conda_pip_interop_pip_clobbers_conda(self):
15171519

15181520
def test_conda_pip_interop_conda_editable_package(self):
15191521
with make_temp_env("python=2.7") as prefix:
1522+
run_command(Commands.CONFIG, prefix, "--set pip_interop_enabled true")
15201523
assert package_is_installed(prefix, "python")
15211524

15221525
# install an "editable" urllib3 that cannot be managed
@@ -1617,6 +1620,7 @@ def test_conda_pip_interop_conda_editable_package(self):
16171620
def test_conda_pip_interop_compatible_release_operator(self):
16181621
# Regression test for #7776
16191622
with make_temp_env("pip=10 six=1.9 appdirs") as prefix:
1623+
run_command(Commands.CONFIG, prefix, "--set pip_interop_enabled true")
16201624
assert package_is_installed(prefix, "python")
16211625
assert package_is_installed(prefix, "six=1.9")
16221626
assert package_is_installed(prefix, "appdirs>=1.4.3")

0 commit comments

Comments
 (0)