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

feat: add explicit flag to list command (#3760)

This commit is contained in:
Sandrine Pataut 2025-01-21 17:35:52 +01:00 committed by GitHub
parent 4a69e30d29
commit 9c856fd4a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 60 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libmamba/src/api/list.cpp
View File

@ -25,11 +25,12 @@ namespace mamba
bool full_name;
bool no_pip;
bool reverse;
bool explicit_;
};
struct formatted_pkg
{
std::string name, version, build, channel;
std::string name, version, build, channel, url;
};
bool compare_alphabetically(const formatted_pkg& a, const formatted_pkg& b)
@ -134,6 +135,7 @@ namespace mamba
pkg_info.platform
);
}
obj["url"] = pkg_info.package_url;
obj["build_number"] = pkg_info.build_number;
obj["build_string"] = pkg_info.build_string;
obj["dist_name"] = pkg_info.str();
@ -163,6 +165,7 @@ namespace mamba
formatted_pkgs.name = package.second.name;
formatted_pkgs.version = package.second.version;
formatted_pkgs.build = package.second.build_string;
formatted_pkgs.url = package.second.package_url;
if (package.second.channel.find("https://repo.anaconda.com/pkgs/") == 0)
{
formatted_pkgs.channel = "";
@ -190,25 +193,34 @@ namespace mamba
std::sort(packages.begin(), packages.end(), comparator);
// format and print table
printers::Table t({ "Name", "Version", "Build", "Channel" });
t.set_alignment({ printers::alignment::left,
printers::alignment::left,
printers::alignment::left,
printers::alignment::left });
t.set_padding({ 2, 2, 2, 2 });
for (auto p : packages)
if (options.explicit_)
{
printers::FormattedString formatted_name(p.name);
if (requested_specs.find(p.name) != requested_specs.end())
for (auto p : packages)
{
formatted_name = printers::FormattedString(p.name);
formatted_name.style = ctx.graphics_params.palette.user;
std::cout << p.url << std::endl;
}
t.add_row({ formatted_name, p.version, p.build, p.channel });
}
else
{
printers::Table t({ "Name", "Version", "Build", "Channel" });
t.set_alignment({ printers::alignment::left,
printers::alignment::left,
printers::alignment::left,
printers::alignment::left });
t.set_padding({ 2, 2, 2, 2 });
t.print(std::cout);
for (auto p : packages)
{
printers::FormattedString formatted_name(p.name);
if (requested_specs.find(p.name) != requested_specs.end())
{
formatted_name = printers::FormattedString(p.name);
formatted_name.style = ctx.graphics_params.palette.user;
}
t.add_row({ formatted_name, p.version, p.build, p.channel });
}
t.print(std::cout);
}
}
}
@ -228,6 +240,7 @@ namespace mamba
options.full_name = config.at("full_name").value<bool>();
options.no_pip = config.at("no_pip").value<bool>();
options.reverse = config.at("reverse").value<bool>();
options.explicit_ = config.at("explicit").value<bool>();
auto channel_context = ChannelContext::make_conda_compatible(config.context());
detail::list_packages(config.context(), regex, channel_context, std::move(options));

8
micromamba/src/list.cpp
View File

@ -38,6 +38,14 @@ init_list_parser(CLI::App* subcom, Configuration& config)
Configurable("reverse", false).group("cli").description("List installed packages in reverse order.")
);
subcom->add_flag("--reverse", reverse.get_cli_config<bool>(), reverse.description());
auto& explicit_ = config.insert(Configurable("explicit", false)
.group("cli")
.description("List explicitly all installed packages with URL."
));
subcom->add_flag("--explicit", explicit_.get_cli_config<bool>(), explicit_.description());
// TODO: implement this in libmamba/list.cpp
/*auto& canonical = config.insert(Configurable("canonical", false)
.group("cli")

26
micromamba/tests/test_list.py
View File

@ -27,7 +27,10 @@ def test_list(
assert "xtensor" in names
assert "xtl" in names
assert all(
i["channel"] == "conda-forge" and i["base_url"] == "https://conda.anaconda.org/conda-forge"
i["channel"] == "conda-forge"
and i["base_url"] == "https://conda.anaconda.org/conda-forge"
and i["name"] in i["url"]
and "conda-forge" in i["url"]
for i in res
)
@ -56,7 +59,7 @@ def test_list_no_json(
assert "xtensor" in res
assert "xtl" in res
# This is what res looks like in this case (with or without a header delimiter):
# This is what res looks like in this case:
# List of packages in environment: "xxx"
# Name Version Build Channel
@ -76,6 +79,25 @@ def test_list_no_json(
assert res.find("xtensor") < res.find("xtl")
@pytest.mark.parametrize("explicit_flag", ["", "--explicit"])
@pytest.mark.parametrize("env_selector", ["", "name", "prefix"])
@pytest.mark.parametrize("shared_pkgs_dirs", [True], indirect=True)
def test_list_explicit_no_json(
tmp_home, tmp_root_prefix, tmp_env_name, tmp_xtensor_env, env_selector, explicit_flag
):
if env_selector == "prefix":
res = helpers.umamba_list("-p", tmp_xtensor_env, explicit_flag)
elif env_selector == "name":
res = helpers.umamba_list("-n", tmp_env_name, explicit_flag)
else:
res = helpers.umamba_list(explicit_flag)
packages_url_list = res.strip().split("\n")[2:]
if explicit_flag == "--explicit":
for url in packages_url_list:
assert "conda-forge" in url
@pytest.mark.parametrize("quiet_flag", ["", "-q", "--quiet"])
@pytest.mark.parametrize("shared_pkgs_dirs", [True], indirect=True)
def test_list_name(tmp_home, tmp_root_prefix, tmp_xtensor_env, quiet_flag):