Merge branch 'main' into fix-etc/profile.d

Author: JohanMabille

libmamba/data/mamba.fish

@@ -54,7 +54,7 @@ if not set -q MAMBA_NO_PROMPT
 end
 
 
-function micromamba --inherit-variable MAMBA_EXE
+function __fish_mamba_wrapper --inherit-variable MAMBA_EXE
   if test (count $argv) -lt 1 || contains -- --help $argv
     $MAMBA_EXE $argv
   else
@@ -72,7 +72,13 @@ function micromamba --inherit-variable MAMBA_EXE
   end
 end
 
+function mamba --inherit-variable MAMBA_EXE
+  __fish_mamba_wrapper
+end
 
+function micromamba --inherit-variable MAMBA_EXE
+  __fish_mamba_wrapper
+end
 
 # Autocompletions below
 

micromamba/tests/test_create.py

@@ -2096,7 +2096,7 @@ def test_repodata_record_patch(tmp_home, tmp_clean_env, tmp_path):
     out = helpers.update("--json", "-p", env_prefix, "--all")
     assert out["success"]
 
-    assert len(out["actions"]["UNLINK"]) == 1
+    assert len(out["actions"]["UNLINK"]) >= 1
     unlink_libarchive = next(pkg for pkg in out["actions"]["UNLINK"] if pkg["name"] == "libarchive")
 
     # TODO: understand why the original linked libarchive has a full URL for the channel
@@ -2105,7 +2105,7 @@ def test_repodata_record_patch(tmp_home, tmp_clean_env, tmp_path):
     unlink_libarchive["channel"] = originally_linked_libarchive["channel"]
     assert unlink_libarchive == originally_linked_libarchive
 
-    assert len(out["actions"]["LINK"]) == 1
+    assert len(out["actions"]["LINK"]) >= 1
     linked_libarchive = next(pkg for pkg in out["actions"]["LINK"] if pkg["name"] == "libarchive")
 
     linked_libarchive_version = Version(linked_libarchive["version"])

micromamba/tests/test_pkg_cache.py

@@ -11,9 +11,14 @@
 from . import helpers
 
 package_to_check = "xtensor"
+package_version_to_check = "0.27.0"
 file_to_find_in_package = "xtensor.hpp"
 
 
+def package_to_check_requirements():
+    return f"{package_to_check}={package_version_to_check}"
+
+
 def find_cache_archive(cache: Path, pkg_name: str) -> Optional[Path]:
     """Find the archive used in cache from the complete build name."""
     tar_bz2 = cache / f"{pkg_name}.tar.bz2"
@@ -46,7 +51,7 @@ def tmp_shared_cache_test_pkg(tmp_path_factory: pytest.TempPathFactory):
         "-c",
         "conda-forge",
         "--no-deps",
-        package_to_check,
+        package_to_check_requirements(),
         no_dry_run=True,
     )
     return root / "pkgs"
@@ -99,7 +104,7 @@ def test_extracted_file_deleted(
         os.remove(tmp_cache_file_in_test_package)
 
         env_name = "some_env"
-        helpers.create(package_to_check, "-n", env_name, no_dry_run=True)
+        helpers.create(package_to_check_requirements(), "-n", env_name, no_dry_run=True)
 
         env_dir = tmp_root_prefix / "envs" / env_name
         pkg_checker = helpers.PackageChecker(package_to_check, env_dir)
@@ -122,7 +127,7 @@ def test_extracted_file_corrupted(
 
         env_name = "x1"
         helpers.create(
-            package_to_check,
+            package_to_check_requirements(),
             "-n",
             env_name,
             "--json",
@@ -157,7 +162,7 @@ def test_tarball_deleted(
         os.remove(tmp_cache_test_pkg)
 
         env_name = "x1"
-        helpers.create(package_to_check, "-n", env_name, "--json", no_dry_run=True)
+        helpers.create(package_to_check_requirements(), "-n", env_name, "--json", no_dry_run=True)
 
         env_dir = tmp_root_prefix / "envs" / env_name
         pkg_checker = helpers.PackageChecker(package_to_check, env_dir)
@@ -178,7 +183,7 @@ def test_tarball_and_extracted_file_deleted(
         os.remove(tmp_cache_test_pkg)
 
         env_name = "x1"
-        helpers.create(package_to_check, "-n", env_name, "--json", no_dry_run=True)
+        helpers.create(package_to_check_requirements(), "-n", env_name, "--json", no_dry_run=True)
 
         env_dir = tmp_root_prefix / "envs" / env_name
         pkg_checker = helpers.PackageChecker(package_to_check, env_dir)
@@ -203,7 +208,7 @@ def test_tarball_corrupted_and_extracted_file_deleted(
             f.write("")
 
         env_name = "x1"
-        helpers.create(package_to_check, "-n", env_name, "--json", no_dry_run=True)
+        helpers.create(package_to_check_requirements(), "-n", env_name, "--json", no_dry_run=True)
 
         env_dir = tmp_root_prefix / "envs" / env_name
         pkg_checker = helpers.PackageChecker(package_to_check, env_dir)
@@ -233,7 +238,7 @@ def test_extracted_file_corrupted_no_perm(
 
         env = "x1"
         cmd_args = (
-            package_to_check,
+            package_to_check_requirements(),
             "-n",
             "--safety-checks",
             safety_checks,
@@ -276,7 +281,9 @@ def test_different_caches(
 
         os.environ["CONDA_PKGS_DIRS"] = f"{cache}"
         env_name = "some_env"
-        res = helpers.create("-n", env_name, package_to_check, "-v", "--json", no_dry_run=True)
+        res = helpers.create(
+            "-n", env_name, package_to_check_requirements(), "-v", "--json", no_dry_run=True
+        )
 
         env_dir = tmp_root_prefix / "envs" / env_name
         pkg_checker = helpers.PackageChecker(package_to_check, env_dir)
@@ -304,7 +311,9 @@ def test_first_writable(
         os.environ["CONDA_PKGS_DIRS"] = f"{tmp_cache},{tmp_cache_alt}"
 
         env_name = "some_env"
-        res = helpers.create("-n", env_name, package_to_check, "--json", no_dry_run=True)
+        res = helpers.create(
+            "-n", env_name, package_to_check_requirements(), "--json", no_dry_run=True
+        )
 
         env_dir = tmp_root_prefix / "envs" / env_name
         pkg_checker = helpers.PackageChecker(package_to_check, env_dir)
@@ -330,7 +339,7 @@ def test_no_writable(self, tmp_home, tmp_root_prefix, tmp_cache, tmp_cache_alt):
 
         os.environ["CONDA_PKGS_DIRS"] = f"{tmp_cache},{tmp_cache_alt}"
 
-        helpers.create("-n", "myenv", package_to_check, "--json", no_dry_run=True)
+        helpers.create("-n", "myenv", package_to_check_requirements(), "--json", no_dry_run=True)
 
     def test_no_writable_extracted_dir_corrupted(self, tmp_home, tmp_root_prefix, tmp_cache):
         old_cache_dir = tmp_cache / find_pkg_build(tmp_cache, package_to_check)
@@ -345,7 +354,9 @@ def test_no_writable_extracted_dir_corrupted(self, tmp_home, tmp_root_prefix, tm
         os.environ["CONDA_PKGS_DIRS"] = f"{tmp_cache}"
 
         with pytest.raises(subprocess.CalledProcessError):
-            helpers.create("-n", "myenv", package_to_check, "-vv", "--json", no_dry_run=True)
+            helpers.create(
+                "-n", "myenv", package_to_check_requirements(), "-vv", "--json", no_dry_run=True
+            )
 
     def test_first_writable_extracted_dir_corrupted(
         self, tmp_home, tmp_root_prefix, tmp_cache, tmp_cache_alt
@@ -365,7 +376,9 @@ def test_first_writable_extracted_dir_corrupted(
         os.environ["CONDA_PKGS_DIRS"] = f"{tmp_cache},{tmp_cache_alt}"
         env_name = "myenv"
 
-        helpers.create("-n", env_name, package_to_check, "-vv", "--json", no_dry_run=True)
+        helpers.create(
+            "-n", env_name, package_to_check_requirements(), "-vv", "--json", no_dry_run=True
+        )
 
         install_env_dir = helpers.get_env(env_name)
         pkg_checker = helpers.PackageChecker(package_to_check, install_env_dir)
@@ -410,7 +423,7 @@ def test_extracted_tarball_only_in_non_writable_cache(
         os.environ["CONDA_PKGS_DIRS"] = f"{tmp_cache},{tmp_cache_alt}"
         env_name = "myenv"
 
-        helpers.create("-n", env_name, package_to_check, "--json", no_dry_run=True)
+        helpers.create("-n", env_name, package_to_check_requirements(), "--json", no_dry_run=True)
 
         install_env_dir = helpers.get_env(env_name)
         pkg_checker = helpers.PackageChecker(package_to_check, install_env_dir)
@@ -450,7 +463,7 @@ def test_missing_extracted_dir_in_non_writable_cache(
         os.environ["CONDA_PKGS_DIRS"] = f"{tmp_cache},{tmp_cache_alt}"
         env_name = "myenv"
 
-        helpers.create("-n", env_name, package_to_check, "--json", no_dry_run=True)
+        helpers.create("-n", env_name, package_to_check_requirements(), "--json", no_dry_run=True)
 
         install_env_dir = helpers.get_env(env_name)
         pkg_checker = helpers.PackageChecker(package_to_check, install_env_dir)
@@ -496,7 +509,9 @@ def test_corrupted_extracted_dir_in_non_writable_cache(
         os.environ["CONDA_PKGS_DIRS"] = f"{tmp_cache},{tmp_cache_alt}"
         env_name = "myenv"
 
-        helpers.create("-n", env_name, "-vv", package_to_check, "--json", no_dry_run=True)
+        helpers.create(
+            "-n", env_name, "-vv", package_to_check_requirements(), "--json", no_dry_run=True
+        )
 
         install_env_dir = helpers.get_env(env_name)
         pkg_checker = helpers.PackageChecker(package_to_check, install_env_dir)
@@ -542,7 +557,7 @@ def test_expired_but_valid_repodata_in_non_writable_cache(
         helpers.create(
             "-n",
             env_name,
-            package_to_check,
+            package_to_check_requirements(),
             "-vv",
             "--json",
             "--repodata-ttl=0",