folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hotfix: in integration tests assume xtensor is v0.26 (#3898)

This commit is contained in:
Klaim (Joël Lamotte) 2025-04-16 18:05:25 +02:00 committed by GitHub
parent 64a620a2aa
commit f75560a4a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
micromamba/tests/helpers.py
View File

@ -56,7 +56,7 @@ def lib_prefix() -> Path:
return Path("")
xtensor_hpp = lib_prefix() / "include/xtensor/xtensor.hpp"
xtensor_hpp = lib_prefix() / "include/xtensor/containers/xtensor.hpp"
xsimd_hpp = lib_prefix() / "include/xsimd/xsimd.hpp"

2
micromamba/tests/test_activation.py
View File

@ -814,7 +814,7 @@ def test_unicode_activation(
else:
include_dir = tmp_root_prefix / f"envs/{u}/include"
assert (include_dir / "xtensor/xtensor.hpp").exists()
assert (include_dir / "xtensor/containers/xtensor.hpp").exists()
# unicode activation on win: todo
if plat == "win":

4
micromamba/tests/test_linking.py
View File

@ -10,9 +10,9 @@ from .helpers import * # noqa: F403
from . import helpers
if platform.system() == "Windows":
xtensor_hpp = "Library/include/xtensor/xtensor.hpp"
xtensor_hpp = "Library/include/xtensor/containers/xtensor.hpp"
else:
xtensor_hpp = "include/xtensor/xtensor.hpp"
xtensor_hpp = "include/xtensor/containers/xtensor.hpp"
class TestLinking:

10
micromamba/tests/test_remove.py
View File

@ -31,7 +31,9 @@ def test_remove(tmp_home, tmp_root_prefix, env_selector, tmp_xtensor_env, tmp_en
assert res["success"]
assert len(res["actions"]["UNLINK"]) == len(env_pkgs)
for p in res["actions"]["UNLINK"]:
assert p["name"] in env_pkgs
assert (
p["name"] in env_pkgs or p["name"] == "libstdcxx-ng"
) # workaround special case lib not always removed
assert res["actions"]["PREFIX"] == str(tmp_xtensor_env)
@ -53,7 +55,7 @@ def test_remove_check_logs(tmp_home, tmp_root_prefix, tmp_xtensor_env, tmp_env_n
@pytest.mark.skipif(sys.platform == "win32", reason="This test is currently failing on Windows")
def test_remove_orphaned(tmp_home, tmp_root_prefix, tmp_xtensor_env, tmp_env_name):
env_pkgs = [p["name"] for p in helpers.umamba_list("-p", tmp_xtensor_env, "--json")]
helpers.install("xtensor-python", "-n", tmp_env_name, no_dry_run=True)
helpers.install("xtensor-python", "xtensor=0.25", "-n", tmp_env_name, no_dry_run=True)
res = helpers.remove("xtensor-python", "-p", tmp_xtensor_env, "--json")
@ -77,7 +79,9 @@ def test_remove_orphaned(tmp_home, tmp_root_prefix, tmp_xtensor_env, tmp_env_nam
1 if helpers.dry_run_tests == helpers.DryRun.DRY else 0
) + (platform.system() == "Linux") # xtl is not removed on Linux
for p in res["actions"]["UNLINK"]:
assert p["name"] in env_pkgs
assert (
p["name"] in env_pkgs or p["name"] == "libstdcxx-ng"
) # workaround special case lib not always removed
assert res["actions"]["PREFIX"] == str(tmp_xtensor_env)