Merge branch 'main' into patch-1

mamba-org · Oct 15, 2024 · faf37d3 · faf37d3
2 parents 6f58c13 + 5e30f9f
commit faf37d3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/docs/source/user_guide/micromamba.rst b/docs/source/user_guide/micromamba.rst
@@ -32,7 +32,7 @@ Quickstarts
     config                      Configuration of micromamba
     info                        Information about micromamba
     constructor                 Commands to support using micromamba in constructor
-    env                         List environments
+    env                         See `mamba/micromamba env --help`.
     activate                    Activate an environment
     run                         Run an executable in an environment
     ps                          Show, inspect or kill running processes

diff --git a/libmamba/data/mamba.fish b/libmamba/data/mamba.fish
@@ -143,7 +143,7 @@ __fish_mamba_complete_subcmds '__fish_mamba_has_command' '
   config                      Configuration of micromamba
   info                        Information about micromamba
   constructor                 Commands to support using micromamba in constructor
-  env                         List environments
+  env                         Access information about environments
   activate                    Activate an environment
   run                         Run an executable in an environment
   ps                          Show, inspect or kill running processes

diff --git a/micromamba/src/umamba.cpp b/micromamba/src/umamba.cpp
@@ -87,7 +87,7 @@ set_umamba_command(CLI::App* com, mamba::Configuration& config)
     );
     set_constructor_command(constructor_subcom, config);
 
-    CLI::App* env_subcom = com->add_subcommand("env", "List environments");
+    CLI::App* env_subcom = com->add_subcommand("env", "Access information about environments");
     set_env_command(env_subcom, config);
 
     CLI::App* activate_subcom = com->add_subcommand("activate", "Activate an environment");

diff --git a/micromamba/tests/test_env.py b/micromamba/tests/test_env.py
@@ -307,6 +307,8 @@ def test_env_update_conda_forge_with_pypi(tmp_home, tmp_root_prefix, tmp_path):
 channels:
 - conda-forge
 dependencies:
+# This version of Python covers all the versions of numpy available on conda-forge and PyPI for all platforms.
+- python 3.12
 - pip
 - pip:
   - numpy==1.26.4