From 91a2a2b868e7b62350eaf52a3b2dedb594f6e97a Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Tue, 15 Oct 2024 17:06:07 +0200 Subject: [PATCH 1/2] fix: Adapt `test_env_update_pypi_with_conda_forge` (#3537) Signed-off-by: Julien Jerphanion --- micromamba/tests/test_env.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/micromamba/tests/test_env.py b/micromamba/tests/test_env.py index aeb4c94227..1085df3e98 100644 --- 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 From 5e30f9f777be74261ca9911a46500a5e73f2bc0c Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Tue, 15 Oct 2024 17:07:20 +0200 Subject: [PATCH 2/2] maint: Clarify `env` subcommand documentation in help menu (#3502) Signed-off-by: Julien Jerphanion Co-authored-by: Hind-M <70631848+Hind-M@users.noreply.github.com> --- docs/source/user_guide/micromamba.rst | 2 +- libmamba/data/mamba.fish | 2 +- micromamba/src/umamba.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/user_guide/micromamba.rst b/docs/source/user_guide/micromamba.rst index 5bf223d2b3..f5f0adf7e3 100644 --- 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 index d6a8861c5c..2e3c534847 100644 --- 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 index 40ce546a5b..08c2b3964e 100644 --- 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");