From 50a627e002d8260fa2e116e5833190a135aff4e8 Mon Sep 17 00:00:00 2001 From: Antoine Prouvost Date: Thu, 29 Jun 2023 08:29:37 +0200 Subject: [PATCH] Attempt to fix CI (#2637) * Revert "Change brace space in clang-format (#2627)" This reverts commit 3dce9901118a837f889139a052ccc915e0b63198. * Revert "Improvement: Support ZST in mamba and enable ZST by default (#2404)" This reverts commit 60cd358c396b179f80af99a59ee1d9632216afd1. --- .clang-format | 2 +- libmamba/data/conda_exe.hpp | 3 +- libmamba/include/mamba/api/configuration.hpp | 14 +- .../include/mamba/api/configuration_impl.hpp | 7 +- libmamba/include/mamba/core/context.hpp | 57 +++--- libmamba/include/mamba/core/env_lockfile.hpp | 7 +- libmamba/include/mamba/core/execution.hpp | 10 +- .../include/mamba/core/package_handling.hpp | 2 +- .../mamba/core/satisfiability_error.hpp | 2 +- libmamba/include/mamba/core/tasksync.hpp | 22 +-- libmamba/include/mamba/core/util_random.hpp | 6 +- libmamba/include/mamba/core/util_string.hpp | 10 +- libmamba/include/mamba/core/validate.hpp | 2 +- libmamba/include/mamba/specs/repo_data.hpp | 2 +- libmamba/include/mamba/util/cast.hpp | 7 +- libmamba/include/mamba/util/flat_set.hpp | 4 +- libmamba/include/mamba/util/graph.hpp | 16 +- libmamba/src/api/clean.cpp | 20 +- libmamba/src/api/configuration.cpp | 149 +++++++-------- libmamba/src/api/info.cpp | 31 +-- libmamba/src/api/install.cpp | 45 +++-- libmamba/src/api/list.cpp | 16 +- libmamba/src/api/remove.cpp | 14 +- libmamba/src/api/repoquery.cpp | 4 +- libmamba/src/api/shell.cpp | 11 +- libmamba/src/api/update.cpp | 10 +- libmamba/src/core/activation.cpp | 107 ++++++----- libmamba/src/core/channel.cpp | 40 ++-- libmamba/src/core/compression.cpp | 4 +- libmamba/src/core/context.cpp | 15 +- libmamba/src/core/curl.cpp | 2 +- libmamba/src/core/env_lockfile.cpp | 8 +- libmamba/src/core/environment.cpp | 12 +- libmamba/src/core/environments_manager.cpp | 2 +- libmamba/src/core/execution.cpp | 2 +- libmamba/src/core/fsutil.cpp | 4 +- libmamba/src/core/link.cpp | 28 ++- libmamba/src/core/match_spec.cpp | 17 +- libmamba/src/core/menuinst.cpp | 28 +-- libmamba/src/core/output.cpp | 4 +- libmamba/src/core/package_handling.cpp | 8 +- libmamba/src/core/package_paths.cpp | 9 +- libmamba/src/core/pinning.cpp | 2 +- libmamba/src/core/pool.cpp | 4 +- libmamba/src/core/prefix_data.cpp | 8 +- libmamba/src/core/progress_bar_impl.cpp | 20 +- libmamba/src/core/progress_bar_impl.hpp | 4 +- libmamba/src/core/query.cpp | 17 +- libmamba/src/core/repo.cpp | 4 +- libmamba/src/core/run.cpp | 33 ++-- libmamba/src/core/satisfiability_error.cpp | 24 +-- libmamba/src/core/shell_init.cpp | 29 ++- libmamba/src/core/singletons.cpp | 6 +- libmamba/src/core/solver.cpp | 42 ++-- libmamba/src/core/subdirdata.cpp | 157 ++++++++++----- libmamba/src/core/transaction.cpp | 50 +++-- libmamba/src/core/transaction_context.cpp | 26 +-- libmamba/src/core/url.cpp | 16 +- libmamba/src/core/util.cpp | 21 +- libmamba/src/core/util_os.cpp | 8 +- libmamba/src/core/util_string.cpp | 14 +- libmamba/src/core/validate.cpp | 65 +++---- libmamba/src/core/virtual_packages.cpp | 6 +- libmamba/src/solv-cpp/pool.cpp | 16 +- libmamba/src/solv-cpp/queue.cpp | 8 +- libmamba/src/solv-cpp/repo.cpp | 18 +- libmamba/src/solv-cpp/repo.hpp | 4 +- libmamba/src/solv-cpp/solvable.cpp | 6 +- libmamba/src/solv-cpp/solver.cpp | 6 +- libmamba/src/solv-cpp/transaction.cpp | 9 +- libmamba/src/specs/repo_data.cpp | 4 +- libmamba/src/specs/version.cpp | 36 ++-- libmamba/src/version.cpp | 2 +- libmamba/tests/src/core/test_channel.cpp | 179 +++++++++--------- .../tests/src/core/test_configuration.cpp | 59 +++--- libmamba/tests/src/core/test_cpp.cpp | 63 +++--- .../tests/src/core/test_env_file_reading.cpp | 18 +- libmamba/tests/src/core/test_env_lockfile.cpp | 60 +++--- libmamba/tests/src/core/test_execution.cpp | 4 +- libmamba/tests/src/core/test_filesystem.cpp | 16 +- libmamba/tests/src/core/test_invoke.cpp | 2 +- libmamba/tests/src/core/test_lockfile.cpp | 18 +- libmamba/tests/src/core/test_pinning.cpp | 30 +-- .../src/core/test_satisfiability_error.cpp | 169 +++++++++-------- libmamba/tests/src/core/test_system_env.cpp | 16 +- libmamba/tests/src/core/test_tasksync.cpp | 10 +- libmamba/tests/src/core/test_thread_utils.cpp | 2 +- libmamba/tests/src/core/test_transfer.cpp | 4 +- libmamba/tests/src/core/test_url.cpp | 27 +-- libmamba/tests/src/core/test_util.cpp | 61 +++--- libmamba/tests/src/core/test_util_string.cpp | 118 ++++++------ libmamba/tests/src/core/test_validate.cpp | 42 ++-- .../tests/src/core/test_virtual_packages.cpp | 2 +- libmamba/tests/src/doctest-printer/pair.hpp | 2 +- libmamba/tests/src/doctest-printer/vector.hpp | 2 +- libmamba/tests/src/solv-cpp/pool_data.hpp | 32 ++-- libmamba/tests/src/solv-cpp/test_pool.cpp | 8 +- libmamba/tests/src/solv-cpp/test_queue.cpp | 30 +-- libmamba/tests/src/solv-cpp/test_repo.cpp | 2 +- libmamba/tests/src/solv-cpp/test_solvable.cpp | 52 ++--- .../tests/src/solv-cpp/test_transaction.cpp | 34 ++-- libmamba/tests/src/specs/test_repo_data.cpp | 16 +- libmamba/tests/src/specs/test_version.cpp | 30 +-- libmamba/tests/src/util/test_compare.cpp | 114 +++++------ libmamba/tests/src/util/test_flat_set.cpp | 42 ++-- libmamba/tests/src/util/test_graph.cpp | 48 ++--- libmamba/tests/src/util/test_iterator.cpp | 12 +- libmambapy/libmambapy/__init__.pyi | 2 - libmambapy/src/main.cpp | 31 +-- mamba/mamba/utils.py | 17 +- mamba_package/src/main.cpp | 2 +- micromamba/src/common_options.cpp | 35 ++-- micromamba/src/completer.cpp | 4 +- micromamba/src/config.cpp | 2 +- micromamba/src/constructor.cpp | 4 +- micromamba/src/env.cpp | 12 +- micromamba/src/info.cpp | 58 +++--- micromamba/src/main.cpp | 2 +- micromamba/src/microserver.cpp | 6 +- micromamba/src/repoquery.cpp | 2 +- micromamba/src/run.cpp | 4 +- micromamba/src/server.cpp | 22 +-- micromamba/src/shell.cpp | 16 +- micromamba/src/update.cpp | 12 +- micromamba/src/version.cpp | 2 +- 125 files changed, 1479 insertions(+), 1506 deletions(-) diff --git a/.clang-format b/.clang-format index cc305c4315..3cc4c2c76e 100644 --- a/.clang-format +++ b/.clang-format @@ -24,7 +24,7 @@ ColumnLimit: '100' ConstructorInitializerAllOnOneLineOrOnePerLine: 'false' ConstructorInitializerIndentWidth: '4' ContinuationIndentWidth: '4' -Cpp11BracedListStyle: 'true' +Cpp11BracedListStyle: 'false' DerivePointerAlignment: 'false' DisableFormat: 'false' EmptyLineAfterAccessModifier: Always diff --git a/libmamba/data/conda_exe.hpp b/libmamba/data/conda_exe.hpp index 7b00e75bbf..cdb886ef17 100644 --- a/libmamba/data/conda_exe.hpp +++ b/libmamba/data/conda_exe.hpp @@ -4679,5 +4679,6 @@ unsigned char conda_exe[] = { 0x65, 0xe3, 0x00, 0x00, 0x7e, 0xe3, 0x00, 0x00, 0x54, 0x0b, 0x01, 0x00, 0x7e, 0xe3, 0x00, 0x00, 0x97, 0xe3, 0x00, 0x00, 0x54, 0x0b, 0x01, 0x00, 0x9e, 0xe3, 0x00, 0x00, 0xb7, 0xe3, 0x00, 0x00, 0x54, 0x0b, 0x01, 0x00, 0xb7, 0xe3, 0x00, 0x00, 0xd0, 0xe3, 0x00, 0x00, 0x34, 0x0f, 0x01, 0x00, - 0xd0, 0xe3, 0x00, 0x00, 0x1c, 0xe4, 0x00, 0x00, 0x30, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00}; + 0xd0, 0xe3, 0x00, 0x00, 0x1c, 0xe4, 0x00, 0x00, 0x30, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 +}; std::size_t conda_exe_len = 74752; diff --git a/libmamba/include/mamba/api/configuration.hpp b/libmamba/include/mamba/api/configuration.hpp index 2018e9d72a..9e09d25017 100644 --- a/libmamba/include/mamba/api/configuration.hpp +++ b/libmamba/include/mamba/api/configuration.hpp @@ -521,7 +521,7 @@ namespace mamba std::map converted_values; for (auto& y : values) { - converted_values.insert({y.first, y.second.as()}); + converted_values.insert({ y.first, y.second.as() }); } set_rc_values(converted_values, sources); } @@ -670,13 +670,13 @@ namespace mamba if (this->m_api_configured && (level >= ConfigurationLevel::kApi)) { m_sources.push_back("API"); - m_values.insert({"API", m_value}); + m_values.insert({ "API", m_value }); } if (cli_configured() && (level >= ConfigurationLevel::kCli)) { m_sources.push_back("CLI"); - m_values.insert({"CLI", m_cli_config.value()}); + m_values.insert({ "CLI", m_cli_config.value() }); } if (env_var_configured() && env_var_active() && (level >= ConfigurationLevel::kEnvVar)) @@ -689,7 +689,7 @@ namespace mamba try { m_values.insert( - {env_var, detail::Source::deserialize(env_var_value.value())} + { env_var, detail::Source::deserialize(env_var_value.value()) } ); m_sources.push_back(env_var); } @@ -714,13 +714,13 @@ namespace mamba if ((p_default_value_hook != NULL) && (level >= ConfigurationLevel::kDefault)) { m_sources.push_back("default"); - m_values.insert({"default", p_default_value_hook()}); + m_values.insert({ "default", p_default_value_hook() }); } if (m_sources.empty() && (p_fallback_value_hook != NULL)) { m_sources.push_back("fallback"); - m_values.insert({"fallback", p_fallback_value_hook()}); + m_values.insert({ "fallback", p_fallback_value_hook() }); } if (!m_sources.empty()) @@ -926,7 +926,7 @@ namespace mamba std::string name = configurable.name(); if (m_config.count(name) == 0) { - auto [it, success] = m_config.insert({name, std::move(configurable)}); + auto [it, success] = m_config.insert({ name, std::move(configurable) }); it->second.set_configuration(*this); m_config_order.push_back(name); } diff --git a/libmamba/include/mamba/api/configuration_impl.hpp b/libmamba/include/mamba/api/configuration_impl.hpp index 82c9d517d8..c49215136b 100644 --- a/libmamba/include/mamba/api/configuration_impl.hpp +++ b/libmamba/include/mamba/api/configuration_impl.hpp @@ -58,7 +58,7 @@ namespace mamba { static std::vector default_value(const T&) { - return std::vector({"default"}); + return std::vector({ "default" }); }; static void merge( @@ -328,8 +328,9 @@ namespace YAML { private: - inline static const std::array - log_level_names = {"trace", "debug", "info", "warning", "error", "critical", "off"}; + inline static const std::array log_level_names = { + "trace", "debug", "info", "warning", "error", "critical", "off" + }; public: diff --git a/libmamba/include/mamba/core/context.hpp b/libmamba/include/mamba/core/context.hpp index 3259be5cd6..7757c64b81 100644 --- a/libmamba/include/mamba/core/context.hpp +++ b/libmamba/include/mamba/core/context.hpp @@ -124,55 +124,55 @@ namespace mamba // ssl_verify can be either an empty string (regular SSL verification), // the string "" to indicate no SSL verification, or a path to // a directory with cert files, or a cert file. - std::string ssl_verify{""}; - bool ssl_no_revoke{false}; - bool curl_initialized{false}; // non configurable, used in fetch only + std::string ssl_verify{ "" }; + bool ssl_no_revoke{ false }; + bool curl_initialized{ false }; // non configurable, used in fetch only - std::string user_agent{"mamba/" LIBMAMBA_VERSION_STRING}; + std::string user_agent{ "mamba/" LIBMAMBA_VERSION_STRING }; - int connect_timeout_secs{10}; + int connect_timeout_secs{ 10 }; // int read_timeout_secs { 60 }; - int retry_timeout{2}; // seconds - int retry_backoff{3}; // retry_timeout * retry_backoff - int max_retries{3}; // max number of retries + int retry_timeout{ 2 }; // seconds + int retry_backoff{ 3 }; // retry_timeout * retry_backoff + int max_retries{ 3 }; // max number of retries }; struct OutputParams { - int verbosity{0}; - log_level logging_level{log_level::warn}; + int verbosity{ 0 }; + log_level logging_level{ log_level::warn }; - bool json{false}; - bool quiet{false}; + bool json{ false }; + bool quiet{ false }; - std::string log_pattern{"%^%-9!l%-8n%$ %v"}; - std::size_t log_backtrace{0}; + std::string log_pattern{ "%^%-9!l%-8n%$ %v" }; + std::size_t log_backtrace{ 0 }; }; struct GraphicsParams { - bool no_progress_bars{false}; + bool no_progress_bars{ false }; Palette palette; }; struct SrcParams { - bool no_rc{false}; - bool no_env{false}; + bool no_rc{ false }; + bool no_env{ false }; }; struct CommandParams { - std::string caller_version{""}; - std::string conda_version{"3.8.0"}; - std::string current_command{"mamba"}; - bool is_micromamba{false}; + std::string caller_version{ "" }; + std::string conda_version{ "3.8.0" }; + std::string current_command{ "mamba" }; + bool is_micromamba{ false }; }; struct ThreadsParams { - std::size_t download_threads{5}; - int extract_threads{0}; + std::size_t download_threads{ 5 }; + int extract_threads{ 0 }; }; struct PrefixParams @@ -271,7 +271,7 @@ namespace mamba std::string channel_alias = "https://conda.anaconda.org"; std::map& authentication_info(); - std::vector token_locations{"~/.continuum/anaconda-client/tokens"}; + std::vector token_locations{ "~/.continuum/anaconda-client/tokens" }; bool override_channels_enabled = true; @@ -279,13 +279,14 @@ namespace mamba bool use_only_tar_bz2 = false; - std::vector repodata_has_zst = {"https://conda.anaconda.org/conda-forge"}; + bool repodata_use_zst = false; + std::vector repodata_has_zst = { "https://conda.anaconda.org/conda-forge" }; // usernames on anaconda.org can have a underscore, which influences the // first two characters - const std::regex token_regex{"/t/([a-zA-Z0-9-_]{0,2}[a-zA-Z0-9-]*)"}; - const std::regex http_basicauth_regex{"(://|^)([^\\s]+):([^\\s]+)@"}; - const std::regex scheme_regex{"[a-z][a-z0-9]{0,11}://"}; + const std::regex token_regex{ "/t/([a-zA-Z0-9-_]{0,2}[a-zA-Z0-9-]*)" }; + const std::regex http_basicauth_regex{ "(://|^)([^\\s]+):([^\\s]+)@" }; + const std::regex scheme_regex{ "[a-z][a-z0-9]{0,11}://" }; static Context& instance(); diff --git a/libmamba/include/mamba/core/env_lockfile.hpp b/libmamba/include/mamba/core/env_lockfile.hpp index ef98d6c0f8..f41f4d4101 100644 --- a/libmamba/include/mamba/core/env_lockfile.hpp +++ b/libmamba/include/mamba/core/env_lockfile.hpp @@ -50,10 +50,9 @@ namespace mamba std::optional yaml_error_type = std::nullopt ) { - return mamba_error{ - std::forward(msg), - mamba_error_code::env_lockfile_parsing_failed, - EnvLockFileError{error_code, yaml_error_type}}; + return mamba_error{ std::forward(msg), + mamba_error_code::env_lockfile_parsing_failed, + EnvLockFileError{ error_code, yaml_error_type } }; } }; diff --git a/libmamba/include/mamba/core/execution.hpp b/libmamba/include/mamba/core/execution.hpp index 046e2f7bb1..066cf21728 100644 --- a/libmamba/include/mamba/core/execution.hpp +++ b/libmamba/include/mamba/core/execution.hpp @@ -70,7 +70,7 @@ namespace mamba return; } - std::scoped_lock lock{threads_mutex}; + std::scoped_lock lock{ threads_mutex }; if (is_open) // Double check necessary for correctness { threads.emplace_back(std::forward(task), std::forward(args)...); @@ -91,7 +91,7 @@ namespace mamba return; } - std::scoped_lock lock{threads_mutex}; + std::scoped_lock lock{ threads_mutex }; if (is_open) // Double check necessary for correctness { threads.push_back(std::move(thread)); @@ -116,7 +116,7 @@ namespace mamba invoke_close_handlers(); - std::scoped_lock lock{threads_mutex}; + std::scoped_lock lock{ threads_mutex }; for (auto&& t : threads) { t.join(); @@ -133,7 +133,7 @@ namespace mamba return; } - std::scoped_lock lock{handlers_mutex}; + std::scoped_lock lock{ handlers_mutex }; if (is_open) // Double check needed to avoid adding new handles while closing. { close_handlers.push_back(std::move(handler)); @@ -142,7 +142,7 @@ namespace mamba private: - std::atomic is_open{true}; + std::atomic is_open{ true }; std::vector threads; std::recursive_mutex threads_mutex; // TODO: replace by synchronized_value once available diff --git a/libmamba/include/mamba/core/package_handling.hpp b/libmamba/include/mamba/core/package_handling.hpp index 7cab0d5581..a8bf4edec1 100644 --- a/libmamba/include/mamba/core/package_handling.hpp +++ b/libmamba/include/mamba/core/package_handling.hpp @@ -42,7 +42,7 @@ namespace mamba void extract_conda( const fs::u8path& file, const fs::u8path& dest_dir, - const std::vector& parts = {"info", "pkg"} + const std::vector& parts = { "info", "pkg" } ); void extract(const fs::u8path& file, const fs::u8path& destination); fs::u8path extract(const fs::u8path& file); diff --git a/libmamba/include/mamba/core/satisfiability_error.hpp b/libmamba/include/mamba/core/satisfiability_error.hpp index 7835b2f149..0f6e34d86b 100644 --- a/libmamba/include/mamba/core/satisfiability_error.hpp +++ b/libmamba/include/mamba/core/satisfiability_error.hpp @@ -243,7 +243,7 @@ namespace mamba { fmt::text_style unavailable = fmt::fg(fmt::terminal_color::red); fmt::text_style available = fmt::fg(fmt::terminal_color::green); - std::array indents = {"│ ", " ", "├─ ", "└─ "}; + std::array indents = { "│ ", " ", "├─ ", "└─ " }; }; std::ostream& print_problem_tree_msg( diff --git a/libmamba/include/mamba/core/tasksync.hpp b/libmamba/include/mamba/core/tasksync.hpp index ba35a5ecde..bcdb6ae0b5 100644 --- a/libmamba/include/mamba/core/tasksync.hpp +++ b/libmamba/include/mamba/core/tasksync.hpp @@ -71,7 +71,7 @@ namespace mamba { auto make_remote_status() { - return std::weak_ptr{m_status}; + return std::weak_ptr{ m_status }; } public: @@ -119,12 +119,12 @@ namespace mamba // requested. { // We can use 'this' safely in this scope. notify_begin_execution(); - on_scope_exit _{[&, this] - { - status.reset(); // Make sure we are not keeping the - // TaskSynchronizer waiting - notify_end_execution(); - }}; + on_scope_exit _{ [&, this] + { + status.reset(); // Make sure we are not keeping the + // TaskSynchronizer waiting + notify_end_execution(); + } }; std::invoke(new_work, std::forward(args)...); } }; @@ -178,10 +178,10 @@ namespace mamba struct Status { - std::atomic join_requested{false}; + std::atomic join_requested{ false }; }; - std::atomic m_running_tasks{0}; + std::atomic m_running_tasks{ 0 }; std::shared_ptr m_status = std::make_shared(); @@ -196,7 +196,7 @@ namespace mamba void notify_end_execution() { { - std::unique_lock exit_lock{m_mutex}; + std::unique_lock exit_lock{ m_mutex }; --m_running_tasks; } m_task_end_condition.notify_one(); @@ -209,7 +209,7 @@ namespace mamba return; } - std::unique_lock exit_lock{m_mutex}; + std::unique_lock exit_lock{ m_mutex }; auto remote_status = make_remote_status(); m_status->join_requested = true; diff --git a/libmamba/include/mamba/core/util_random.hpp b/libmamba/include/mamba/core/util_random.hpp index 93cdfc920e..a761063ac6 100644 --- a/libmamba/include/mamba/core/util_random.hpp +++ b/libmamba/include/mamba/core/util_random.hpp @@ -27,7 +27,7 @@ namespace mamba auto dev = std::random_device{}; std::generate_n(begin(seed), seed_len, std::ref(dev)); auto seed_seq = std::seed_seq(begin(seed), end(seed)); - return T{seed_seq}; + return T{ seed_seq }; } template @@ -40,7 +40,7 @@ namespace mamba template inline T random_int(T min, T max, G& generator = local_random_generator()) { - return std::uniform_int_distribution{min, max}(generator); + return std::uniform_int_distribution{ min, max }(generator); } inline std::string generate_random_alphanumeric_string(std::size_t len) @@ -50,7 +50,7 @@ namespace mamba "abcdefghijklmnopqrstuvwxyz"; auto& rng = local_random_generator(); - auto dist = std::uniform_int_distribution{{}, std::strlen(chars) - 1}; + auto dist = std::uniform_int_distribution{ {}, std::strlen(chars) - 1 }; auto result = std::string(len, '\0'); std::generate_n(begin(result), len, [&]() { return chars[dist(rng)]; }); return result; diff --git a/libmamba/include/mamba/core/util_string.hpp b/libmamba/include/mamba/core/util_string.hpp index b941897f34..d58399163b 100644 --- a/libmamba/include/mamba/core/util_string.hpp +++ b/libmamba/include/mamba/core/util_string.hpp @@ -234,7 +234,7 @@ namespace mamba const Value& sep, const Value& etc, std::size_t threshold = 5, - std::pair show = {2, 1} + std::pair show = { 2, 1 } ); /** @@ -255,7 +255,7 @@ namespace mamba std::string_view sep = ", ", std::string_view etc = "...", std::size_t threshold = 5, - std::pair show = {2, 1}, + std::pair show = { 2, 1 }, Joiner joiner = detail::PlusEqual{} ) -> typename Range::value_type; ; @@ -339,7 +339,7 @@ namespace mamba [&should_strip](Char c) -> bool { return !should_strip(c); } ); const auto start_idx = static_cast(start_iter - input.cbegin()); - return {input.substr(0, start_idx), input.substr(start_idx)}; + return { input.substr(0, start_idx), input.substr(start_idx) }; } } @@ -379,7 +379,7 @@ namespace mamba [&should_strip](Char c) -> bool { return !should_strip(c); } ); const auto past_end_idx = static_cast(input.crend() - rstart_iter); - return {input.substr(0, past_end_idx), input.substr(past_end_idx)}; + return { input.substr(0, past_end_idx), input.substr(past_end_idx) }; } } @@ -415,7 +415,7 @@ namespace mamba { const auto [head, not_head] = lstrip_if_parts(input, should_strip); const auto [body, tail] = rstrip_if_parts(not_head, std::move(should_strip)); - return {head, body, tail}; + return { head, body, tail }; } } diff --git a/libmamba/include/mamba/core/validate.hpp b/libmamba/include/mamba/core/validate.hpp index 815c02e43d..e23bea2964 100644 --- a/libmamba/include/mamba/core/validate.hpp +++ b/libmamba/include/mamba/core/validate.hpp @@ -255,7 +255,7 @@ namespace mamba::validation static Key from_ed25519(std::string keyval) { - return {"ed25519", "ed25519", keyval}; + return { "ed25519", "ed25519", keyval }; } }; diff --git a/libmamba/include/mamba/specs/repo_data.hpp b/libmamba/include/mamba/specs/repo_data.hpp index f54f2d7bdc..cce653a2aa 100644 --- a/libmamba/include/mamba/specs/repo_data.hpp +++ b/libmamba/include/mamba/specs/repo_data.hpp @@ -68,7 +68,7 @@ namespace mamba::specs std::string name = {}; /** The version of the package. */ - Version version = Version(0, {{{0}}}); + Version version = Version(0, { { { 0 } } }); /** The build string of the package. */ std::string build_string = {}; diff --git a/libmamba/include/mamba/util/cast.hpp b/libmamba/include/mamba/util/cast.hpp index 6837d1fbb9..cbac84e4d4 100644 --- a/libmamba/include/mamba/util/cast.hpp +++ b/libmamba/include/mamba/util/cast.hpp @@ -36,12 +36,12 @@ namespace mamba::util template constexpr auto make_overflow_error(const From& val) { - return std::overflow_error{fmt::format( + return std::overflow_error{ fmt::format( "Value to cast ({}) is out of destination range ([{}, {}])", val, std::numeric_limits::lowest(), std::numeric_limits::max() - )}; + ) }; }; } @@ -106,7 +106,8 @@ namespace mamba::util if (cast_back != val) { throw std::runtime_error{ - fmt::format("Casting from {} to {} loses precision", val, cast)}; + fmt::format("Casting from {} to {} loses precision", val, cast) + }; } return cast; } diff --git a/libmamba/include/mamba/util/flat_set.hpp b/libmamba/include/mamba/util/flat_set.hpp index 623aef31be..443a1413e9 100644 --- a/libmamba/include/mamba/util/flat_set.hpp +++ b/libmamba/include/mamba/util/flat_set.hpp @@ -260,10 +260,10 @@ namespace mamba::util auto it = std::lower_bound(begin(), end(), value, m_compare); if ((it != end()) && (key_eq(*it, value))) { - return {it, false}; + return { it, false }; } it = Base::insert(it, std::forward(value)); - return {it, true}; + return { it, true }; } template diff --git a/libmamba/include/mamba/util/graph.hpp b/libmamba/include/mamba/util/graph.hpp index 9be6af2381..c5bf508052 100644 --- a/libmamba/include/mamba/util/graph.hpp +++ b/libmamba/include/mamba/util/graph.hpp @@ -616,7 +616,7 @@ namespace mamba::util template PreorderVisitor(UnaryFuncU&& func) - : m_func{std::forward(func)} + : m_func{ std::forward(func) } { } @@ -639,7 +639,7 @@ namespace mamba::util template PostorderVisitor(UnaryFuncU&& func) - : m_func{std::forward(func)} + : m_func{ std::forward(func) } { } @@ -713,7 +713,7 @@ namespace mamba::util { target_visited = target_visited || (node == target); } - } visitor{{}, target}; + } visitor{ {}, target }; dfs_raw(graph, visitor, source); return visitor.target_visited; @@ -757,7 +757,7 @@ namespace mamba::util template bool DiGraph::remove_edge(node_id from, node_id to) { - m_edges.erase({from, to}); // No-op if edge does not exists + m_edges.erase({ from, to }); // No-op if edge does not exists return Base::remove_edge(from, to); } @@ -767,11 +767,11 @@ namespace mamba::util // No-op if edge does not exists for (const auto& to : successors(id)) { - m_edges.erase({id, to}); + m_edges.erase({ id, to }); } for (const auto& from : predecessors(id)) { - m_edges.erase({from, id}); + m_edges.erase({ from, id }); } return Base::remove_node(id); } @@ -791,7 +791,7 @@ namespace mamba::util template auto DiGraph::edge(node_id from, node_id to) const -> const edge_t& { - return edge({from, to}); + return edge({ from, to }); } template @@ -803,7 +803,7 @@ namespace mamba::util template auto DiGraph::edge(node_id from, node_id to) -> edge_t& { - return edge({from, to}); + return edge({ from, to }); } } #endif diff --git a/libmamba/src/api/clean.cpp b/libmamba/src/api/clean.cpp index 48e1ec45d8..8f2c1af7db 100644 --- a/libmamba/src/api/clean.cpp +++ b/libmamba/src/api/clean.cpp @@ -164,10 +164,10 @@ namespace mamba { std::vector res; std::size_t total_size = 0; - std::vector header = {"Package file", "Size"}; + std::vector header = { "Package file", "Size" }; mamba::printers::Table t(header); - t.set_alignment({printers::alignment::left, printers::alignment::right}); - t.set_padding({2, 4}); + t.set_alignment({ printers::alignment::left, printers::alignment::right }); + t.set_padding({ 2, 4 }); for (auto* pkg_cache : caches.writable_caches()) { @@ -181,7 +181,7 @@ namespace mamba || ends_with(p.path().string(), ".conda"))) { res.push_back(p.path()); - rows.push_back({p.path().filename().string(), get_file_size(p.file_size())}); + rows.push_back({ p.path().filename().string(), get_file_size(p.file_size()) }); total_size += p.file_size(); } } @@ -194,7 +194,7 @@ namespace mamba } if (total_size) { - t.add_rows({}, {{"Total size: ", get_file_size(total_size)}}); + t.add_rows({}, { { "Total size: ", get_file_size(total_size) } }); t.print(std::cout); } return res; @@ -238,10 +238,10 @@ namespace mamba { std::vector res; std::size_t total_size = 0; - std::vector header = {"Package folder", "Size"}; + std::vector header = { "Package folder", "Size" }; mamba::printers::Table t(header); - t.set_alignment({printers::alignment::left, printers::alignment::right}); - t.set_padding({2, 4}); + t.set_alignment({ printers::alignment::left, printers::alignment::right }); + t.set_padding({ 2, 4 }); for (auto* pkg_cache : caches.writable_caches()) { @@ -258,7 +258,7 @@ namespace mamba } res.push_back(p.path()); std::size_t folder_size = get_folder_size(p); - rows.push_back({p.path().filename().string(), get_file_size(folder_size)}); + rows.push_back({ p.path().filename().string(), get_file_size(folder_size) }); total_size += folder_size; } } @@ -271,7 +271,7 @@ namespace mamba } if (total_size) { - t.add_rows({}, {{"Total size: ", get_file_size(total_size)}}); + t.add_rows({}, { { "Total size: ", get_file_size(total_size) } }); t.print(std::cout); } return res; diff --git a/libmamba/src/api/configuration.cpp b/libmamba/src/api/configuration.cpp index 3da651b4d6..3d670e33a2 100644 --- a/libmamba/src/api/configuration.cpp +++ b/libmamba/src/api/configuration.cpp @@ -199,7 +199,7 @@ namespace mamba { if (names.empty()) { - p_impl->m_env_var_names = {"MAMBA_" + to_upper(p_impl->m_name)}; + p_impl->m_env_var_names = { "MAMBA_" + to_upper(p_impl->m_name) }; } else { @@ -826,7 +826,7 @@ namespace mamba std::vector fallback_envs_dirs_hook() { - return {Context::instance().prefix_params.root_prefix / "envs"}; + return { Context::instance().prefix_params.root_prefix / "envs" }; } void envs_dirs_hook(std::vector& dirs) @@ -844,9 +844,8 @@ namespace mamba std::vector fallback_pkgs_dirs_hook() { - std::vector paths = { - Context::instance().prefix_params.root_prefix / "pkgs", - env::home_directory() / ".mamba" / "pkgs"}; + std::vector paths = { Context::instance().prefix_params.root_prefix / "pkgs", + env::home_directory() / ".mamba" / "pkgs" }; #ifdef _WIN32 auto appdata = env::get("APPDATA"); if (appdata) @@ -889,7 +888,7 @@ namespace mamba fs::u8path get_conda_root_prefix() { - std::vector args = {"conda", "config", "--show", "root_prefix", "--json"}; + std::vector args = { "conda", "config", "--show", "root_prefix", "--json" }; std::string out, err; auto [status, ec] = reproc::run( args, @@ -1060,7 +1059,7 @@ namespace mamba Configurable("root_prefix", &ctx.prefix_params.root_prefix) .group("Basic") .set_env_var_names() - .needs({"create_base", "rc_files"}) + .needs({ "create_base", "rc_files" }) .description("Path to the root prefix") .set_post_merge_hook([&](fs::u8path& value) { return detail::root_prefix_hook(*this, value); }) @@ -1072,24 +1071,26 @@ namespace mamba .set_single_op_lifetime() .description("Define if base environment will be initialized empty")); - insert( - Configurable("target_prefix", &ctx.prefix_params.target_prefix) - .group("Basic") - .set_env_var_names() - .needs({"root_prefix", "envs_dirs", "env_name", "spec_file_env_name", "use_target_prefix_fallback"} - ) - .set_single_op_lifetime() - .description("Path to the target prefix") - .set_post_merge_hook([this](fs::u8path& value) - { return detail::target_prefix_hook(*this, value); }) - .set_post_context_hook([this] - { return detail::post_target_prefix_rc_loading(*this); }) - ); + insert(Configurable("target_prefix", &ctx.prefix_params.target_prefix) + .group("Basic") + .set_env_var_names() + .needs({ "root_prefix", + "envs_dirs", + "env_name", + "spec_file_env_name", + "use_target_prefix_fallback" }) + .set_single_op_lifetime() + .description("Path to the target prefix") + .set_post_merge_hook( + [this](fs::u8path& value) { return detail::target_prefix_hook(*this, value); } + ) + .set_post_context_hook([this] + { return detail::post_target_prefix_rc_loading(*this); })); insert(Configurable("relocate_prefix", &ctx.prefix_params.relocate_prefix) .group("Basic") .set_env_var_names() - .needs({"target_prefix"}) + .needs({ "target_prefix" }) .set_single_op_lifetime() .description("Path to the relocation prefix")); @@ -1100,14 +1101,14 @@ namespace mamba insert(Configurable("target_prefix_checks", MAMBA_NO_PREFIX_CHECK) .group("Basic") - .needs({"target_prefix", "rc_files"}) + .needs({ "target_prefix", "rc_files" }) .description("The type of checks performed on the target prefix") .set_single_op_lifetime() .set_post_merge_hook(detail::target_prefix_checks_hook)); insert(Configurable("env_name", std::string("")) .group("Basic") - .needs({"root_prefix", "spec_file_env_name", "envs_dirs"}) + .needs({ "root_prefix", "spec_file_env_name", "envs_dirs" }) .set_single_op_lifetime() .set_post_merge_hook([&](std::string& value) { return detail::env_name_hook(*this, value); }) @@ -1116,8 +1117,8 @@ namespace mamba insert(Configurable("envs_dirs", &ctx.envs_dirs) .group("Basic") .set_rc_configurable(RCConfigLevel::kHomeDir) - .set_env_var_names({"CONDA_ENVS_DIRS"}) - .needs({"root_prefix"}) + .set_env_var_names({ "CONDA_ENVS_DIRS" }) + .needs({ "root_prefix" }) .set_fallback_value_hook(detail::fallback_envs_dirs_hook) .set_post_merge_hook(detail::envs_dirs_hook) .description("Possible locations of named environments")); @@ -1125,8 +1126,8 @@ namespace mamba insert(Configurable("pkgs_dirs", &ctx.pkgs_dirs) .group("Basic") .set_rc_configurable() - .set_env_var_names({"CONDA_PKGS_DIRS"}) - .needs({"root_prefix"}) + .set_env_var_names({ "CONDA_PKGS_DIRS" }) + .needs({ "root_prefix" }) .set_fallback_value_hook(detail::fallback_pkgs_dirs_hook) .set_post_merge_hook(detail::pkgs_dirs_hook) .description("Possible locations of packages caches")); @@ -1134,7 +1135,7 @@ namespace mamba insert(Configurable("platform", &ctx.platform) .group("Basic") .set_rc_configurable() - .set_env_var_names({"CONDA_SUBDIR", "MAMBA_PLATFORM"}) + .set_env_var_names({ "CONDA_SUBDIR", "MAMBA_PLATFORM" }) .description("The platform description") .long_description(unindent(R"( The plaftorm description points what channels @@ -1143,14 +1144,14 @@ namespace mamba insert(Configurable("spec_file_env_name", std::string("")) .group("Basic") - .needs({"file_specs", "root_prefix"}) + .needs({ "file_specs", "root_prefix" }) .set_single_op_lifetime() .set_post_merge_hook(detail::file_spec_env_name_hook) .description("Name of the target prefix, specified in a YAML spec file")); insert(Configurable("specs", std::vector({})) .group("Basic") - .needs({"file_specs"}) // explicit file specs overwrite current specs + .needs({ "file_specs" }) // explicit file specs overwrite current specs .set_single_op_lifetime() .description("Packages specification")); @@ -1184,9 +1185,9 @@ namespace mamba insert(Configurable("channels", &ctx.channels) .group("Channels") .set_rc_configurable() - .set_env_var_names({"CONDA_CHANNELS"}) + .set_env_var_names({ "CONDA_CHANNELS" }) .description("Define the list of channels") - .needs({"file_specs"}) + .needs({ "file_specs" }) .long_description(unindent(R"( The list of channels where the packages will be searched for. See also 'channel_priority'.)")) @@ -1231,6 +1232,11 @@ namespace mamba .set_env_var_names() .description("Permit use of the --overide-channels command-line flag")); + insert(Configurable("repodata_use_zst", &ctx.repodata_use_zst) + .group("Repodata") + .set_rc_configurable() + .description("Use zstd encoded repodata when fetching")); + insert(Configurable("repodata_has_zst", &ctx.repodata_has_zst) .group("Repodata") .set_rc_configurable() @@ -1285,7 +1291,7 @@ namespace mamba 'ssl_verify' can be either an empty string (regular SSL verification), the string "" to indicate no SSL verification, or a path to a directory with cert files, or a cert file..)")) - .needs({"cacert_path", "offline"}) + .needs({ "cacert_path", "offline" }) .set_post_merge_hook( [this](auto&... args) { return detail::ssl_verify_hook(*this, args...); } )); @@ -1395,7 +1401,7 @@ namespace mamba Configurable("only_deps", false).group("Solver").description("Only install dependencies") ); - insert(Configurable("categories", std::vector({"main"})) + insert(Configurable("categories", std::vector({ "main" })) .group("Solver") .description("Package categories to consider when installing from a lock file")); @@ -1463,7 +1469,7 @@ namespace mamba .group("Extract, Link & Install") .set_rc_configurable() .set_env_var_names() - .needs({"always_copy"}) + .needs({ "always_copy" }) .set_post_merge_hook( [&](decltype(ctx.always_softlink)& value) { return detail::always_softlink_hook(*this, value); } @@ -1487,7 +1493,7 @@ namespace mamba insert(Configurable("safety_checks", &ctx.safety_checks) .group("Extract, Link & Install") .set_rc_configurable() - .set_env_var_names({"CONDA_SAFETY_CHECKS", "MAMBA_SAFETY_CHECKS"}) + .set_env_var_names({ "CONDA_SAFETY_CHECKS", "MAMBA_SAFETY_CHECKS" }) .description("Safety checks policy ('enabled', 'warn', or 'disabled')") .long_description(unindent(R"( Enforce available safety guarantees during package installation. The @@ -1496,7 +1502,7 @@ namespace mamba insert(Configurable("extra_safety_checks", &ctx.extra_safety_checks) .group("Extract, Link & Install") .set_rc_configurable() - .set_env_var_names({"CONDA_EXTRA_SAFETY_CHECKS", "MAMBA_EXTRA_SAFETY_CHECKS"}) + .set_env_var_names({ "CONDA_EXTRA_SAFETY_CHECKS", "MAMBA_EXTRA_SAFETY_CHECKS" }) .description("Run extra verifications on packages") .long_description(unindent(R"( Spend extra time validating package contents. Currently, runs sha256 @@ -1568,7 +1574,7 @@ namespace mamba .group("Output, Prompt and Flow Control") .set_rc_configurable() .set_env_var_names() - .needs({"json", "verbose"}) + .needs({ "json", "verbose" }) .description("Set the log level") .set_fallback_value_hook( [this] { return detail::log_level_fallback_hook(*this); } @@ -1598,7 +1604,7 @@ namespace mamba insert(Configurable("json", &ctx.output_params.json) .group("Output, Prompt and Flow Control") .set_rc_configurable() - .needs({"print_config_only", "print_context_only"}) + .needs({ "print_config_only", "print_context_only" }) .set_env_var_names() .description("Report all output as json")); @@ -1632,7 +1638,7 @@ namespace mamba insert(Configurable("print_config_only", false) .group("Output, Prompt and Flow Control") - .needs({"debug"}) + .needs({ "debug" }) .set_post_merge_hook( [&](bool& value) { return detail::print_config_only_hook(*this, value); } ) @@ -1640,7 +1646,7 @@ namespace mamba insert(Configurable("print_context_only", false) .group("Output, Prompt and Flow Control") - .needs({"debug"}) + .needs({ "debug" }) .set_post_merge_hook( [&](bool& value) { return detail::print_context_only_hook(*this, value); } ) @@ -1678,7 +1684,7 @@ namespace mamba .group("Output, Prompt and Flow Control") .set_rc_configurable() .set_env_var_names() - .needs({"json", "print_config_only", "print_context_only"}) + .needs({ "json", "print_config_only", "print_context_only" }) .description("Set quiet mode (print less output)")); insert(Configurable("verbose", 0) @@ -1695,8 +1701,8 @@ namespace mamba // Config insert(Configurable("rc_files", std::vector({})) .group("Config sources") - .set_env_var_names({"MAMBARC", "CONDARC"}) - .needs({"no_rc"}) + .set_env_var_names({ "MAMBARC", "CONDARC" }) + .needs({ "no_rc" }) .set_post_merge_hook(detail::rc_files_hook) .description("Paths to the configuration files to use")); @@ -1744,7 +1750,7 @@ namespace mamba for (auto& g : group_order) { - res.push_back({g, map.at(g)}); + res.push_back({ g, map.at(g) }); } return res; @@ -1757,43 +1763,34 @@ namespace mamba std::vector system; if constexpr (on_mac || on_linux) { - system = { - "/etc/conda/.condarc", - "/etc/conda/condarc", - "/etc/conda/condarc.d/", - "/etc/conda/.mambarc", - "/var/lib/conda/.condarc", - "/var/lib/conda/condarc", - "/var/lib/conda/condarc.d/", - "/var/lib/conda/.mambarc"}; + system = { "/etc/conda/.condarc", "/etc/conda/condarc", + "/etc/conda/condarc.d/", "/etc/conda/.mambarc", + "/var/lib/conda/.condarc", "/var/lib/conda/condarc", + "/var/lib/conda/condarc.d/", "/var/lib/conda/.mambarc" }; } else { - system = { - "C:\\ProgramData\\conda\\.condarc", - "C:\\ProgramData\\conda\\condarc", - "C:\\ProgramData\\conda\\condarc.d", - "C:\\ProgramData\\conda\\.mambarc"}; + system = { "C:\\ProgramData\\conda\\.condarc", + "C:\\ProgramData\\conda\\condarc", + "C:\\ProgramData\\conda\\condarc.d", + "C:\\ProgramData\\conda\\.mambarc" }; } - std::vector root = { - ctx.prefix_params.root_prefix / ".condarc", - ctx.prefix_params.root_prefix / "condarc", - ctx.prefix_params.root_prefix / "condarc.d", - ctx.prefix_params.root_prefix / ".mambarc"}; + std::vector root = { ctx.prefix_params.root_prefix / ".condarc", + ctx.prefix_params.root_prefix / "condarc", + ctx.prefix_params.root_prefix / "condarc.d", + ctx.prefix_params.root_prefix / ".mambarc" }; - std::vector home = { - env::home_directory() / ".conda/.condarc", - env::home_directory() / ".conda/condarc", - env::home_directory() / ".conda/condarc.d", - env::home_directory() / ".condarc", - env::home_directory() / ".mambarc"}; + std::vector home = { env::home_directory() / ".conda/.condarc", + env::home_directory() / ".conda/condarc", + env::home_directory() / ".conda/condarc.d", + env::home_directory() / ".condarc", + env::home_directory() / ".mambarc" }; - std::vector prefix = { - ctx.prefix_params.target_prefix / ".condarc", - ctx.prefix_params.target_prefix / "condarc", - ctx.prefix_params.target_prefix / "condarc.d", - ctx.prefix_params.target_prefix / ".mambarc"}; + std::vector prefix = { ctx.prefix_params.target_prefix / ".condarc", + ctx.prefix_params.target_prefix / "condarc", + ctx.prefix_params.target_prefix / "condarc.d", + ctx.prefix_params.target_prefix / ".mambarc" }; std::vector sources; @@ -2072,7 +2069,7 @@ namespace mamba continue; } - m_rc_yaml_nodes_cache.insert({s, node}); + m_rc_yaml_nodes_cache.insert({ s, node }); } m_valid_sources.push_back(s); } diff --git a/libmamba/src/api/info.cpp b/libmamba/src/api/info.cpp index 8e4867391a..7ab2da08d1 100644 --- a/libmamba/src/api/info.cpp +++ b/libmamba/src/api/info.cpp @@ -78,7 +78,7 @@ namespace mamba std::map items_map; for (auto& [key, val] : items) { - items_map.insert({key, val}); + items_map.insert({ key, val }); } Console::instance().json_write(items_map); @@ -89,18 +89,18 @@ namespace mamba auto& ctx = Context::instance(); std::vector> items; - items.push_back({"libmamba version", version()}); + items.push_back({ "libmamba version", version() }); if (ctx.command_params.is_micromamba && !ctx.command_params.caller_version.empty()) { - items.push_back({"micromamba version", ctx.command_params.caller_version}); + items.push_back({ "micromamba version", ctx.command_params.caller_version }); } - items.push_back({"curl version", curl_version()}); - items.push_back({"libarchive version", archive_version_details()}); + items.push_back({ "curl version", curl_version() }); + items.push_back({ "libarchive version", archive_version_details() }); - items.push_back({"envs directories", ctx.envs_dirs}); - items.push_back({"package cache", ctx.pkgs_dirs}); + items.push_back({ "envs directories", ctx.envs_dirs }); + items.push_back({ "package cache", ctx.pkgs_dirs }); std::string name, location; if (!ctx.prefix_params.target_prefix.empty()) @@ -132,25 +132,26 @@ namespace mamba name += " (not found)"; } - items.push_back({"environment", name}); - items.push_back({"env location", location}); + items.push_back({ "environment", name }); + items.push_back({ "env location", location }); // items.insert( { "shell level", { 1 } }); - items.push_back({"user config files", {(env::home_directory() / ".mambarc").string()}}); + items.push_back({ "user config files", + { (env::home_directory() / ".mambarc").string() } }); std::vector sources; for (auto s : config.valid_sources()) { sources.push_back(s.string()); }; - items.push_back({"populated config files", sources}); + items.push_back({ "populated config files", sources }); std::vector virtual_pkgs; for (auto pkg : get_virtual_packages()) { virtual_pkgs.push_back(concat(pkg.name, "=", pkg.version, "=", pkg.build_string)); } - items.push_back({"virtual packages", virtual_pkgs}); + items.push_back({ "virtual packages", virtual_pkgs }); std::vector channels = ctx.channels; // Always append context channels @@ -164,11 +165,11 @@ namespace mamba channel_urls.push_back(url); } } - items.push_back({"channels", channel_urls}); + items.push_back({ "channels", channel_urls }); - items.push_back({"base environment", ctx.prefix_params.root_prefix.string()}); + items.push_back({ "base environment", ctx.prefix_params.root_prefix.string() }); - items.push_back({"platform", ctx.platform}); + items.push_back({ "platform", ctx.platform }); info_json_print(items); info_pretty_print(items); diff --git a/libmamba/src/api/install.cpp b/libmamba/src/api/install.cpp index de5c06a97d..c0c90c3063 100644 --- a/libmamba/src/api/install.cpp +++ b/libmamba/src/api/install.cpp @@ -44,9 +44,11 @@ namespace mamba { return env::which("python", get_path_dirs(target_prefix)).string(); }; const std::unordered_map other_pkg_mgr_install_instructions{ - {"pip", {get_python_path(), "-m", "pip", "install", "-r", spec_file, "--no-input"}}, - {"pip --no-deps", - {get_python_path(), "-m", "pip", "install", "--no-deps", "-r", spec_file, "--no-input"}}}; + { "pip", + { get_python_path(), "-m", "pip", "install", "-r", spec_file, "--no-input" } }, + { "pip --no-deps", + { get_python_path(), "-m", "pip", "install", "--no-deps", "-r", spec_file, "--no-input" } } + }; auto found_it = other_pkg_mgr_install_instructions.find(name); if (found_it != other_pkg_mgr_install_instructions.end()) @@ -164,10 +166,10 @@ namespace mamba auto& truthy_values() { static std::map vals{ - {"win", 0}, - {"unix", 0}, - {"osx", 0}, - {"linux", 0}, + { "win", 0 }, + { "unix", 0 }, + { "osx", 0 }, + { "linux", 0 }, }; const auto& ctx = Context::instance(); @@ -456,7 +458,7 @@ namespace mamba // add channels from specs for (const auto& s : specs) { - if (auto m = MatchSpec{s, channel_context}; !m.channel.empty()) + if (auto m = MatchSpec{ s, channel_context }; !m.channel.empty()) { ctx.channels.push_back(m.channel); } @@ -467,7 +469,7 @@ namespace mamba LOG_WARNING << "No 'channels' specified"; } - MPool pool{channel_context}; + MPool pool{ channel_context }; // functions implied in 'and_then' coding-styles must return the same type // which limits this syntax /*auto exp_prefix_data = load_channels(pool, package_caches, is_retry) @@ -504,17 +506,15 @@ namespace mamba MSolver solver( pool, { - {SOLVER_FLAG_ALLOW_UNINSTALL, ctx.allow_uninstall}, - {SOLVER_FLAG_ALLOW_DOWNGRADE, ctx.allow_downgrade}, - {SOLVER_FLAG_STRICT_REPO_PRIORITY, ctx.channel_priority == ChannelPriority::kStrict}, + { SOLVER_FLAG_ALLOW_UNINSTALL, ctx.allow_uninstall }, + { SOLVER_FLAG_ALLOW_DOWNGRADE, ctx.allow_downgrade }, + { SOLVER_FLAG_STRICT_REPO_PRIORITY, ctx.channel_priority == ChannelPriority::kStrict }, } ); - solver.set_postsolve_flags( - {{MAMBA_NO_DEPS, no_deps}, - {MAMBA_ONLY_DEPS, only_deps}, - {MAMBA_FORCE_REINSTALL, force_reinstall}} - ); + solver.set_postsolve_flags({ { MAMBA_NO_DEPS, no_deps }, + { MAMBA_ONLY_DEPS, only_deps }, + { MAMBA_FORCE_REINSTALL, force_reinstall } }); if (freeze_installed && !prefix_pkgs.empty()) { @@ -574,9 +574,8 @@ namespace mamba if (ctx.output_params.json) { - Console::instance().json_write( - {{"success", false}, {"solver_problems", solver.all_problems()}} - ); + Console::instance().json_write({ { "success", false }, + { "solver_problems", solver.all_problems() } }); } throw mamba_error( "Could not solve for environment specs", @@ -620,7 +619,7 @@ namespace mamba bool create_env ) { - MPool pool{channel_context}; + MPool pool{ channel_context }; auto& ctx = Context::instance(); auto exp_prefix_data = PrefixData::create(ctx.prefix_params.target_prefix, channel_context); if (!exp_prefix_data) @@ -723,9 +722,9 @@ namespace mamba Console::instance().print(join( "", - std::vector({"Empty environment created at prefix: ", prefix.string()}) + std::vector({ "Empty environment created at prefix: ", prefix.string() }) )); - Console::instance().json_write({{"success", true}}); + Console::instance().json_write({ { "success", true } }); } void create_target_directory(const fs::u8path prefix) diff --git a/libmamba/src/api/list.cpp b/libmamba/src/api/list.cpp index 4fc7afbcbd..85142873e0 100644 --- a/libmamba/src/api/list.cpp +++ b/libmamba/src/api/list.cpp @@ -121,14 +121,12 @@ namespace mamba std::sort(packages.begin(), packages.end(), compare_alphabetically); // 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}); + 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) { @@ -138,7 +136,7 @@ namespace mamba 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.add_row({ formatted_name, p.version, p.build, p.channel }); } t.print(std::cout); diff --git a/libmamba/src/api/remove.cpp b/libmamba/src/api/remove.cpp index 058fc6cdcd..66ffb2d2e3 100644 --- a/libmamba/src/api/remove.cpp +++ b/libmamba/src/api/remove.cpp @@ -87,11 +87,11 @@ namespace mamba } PrefixData& prefix_data = exp_prefix_data.value(); - MPool pool{channel_context}; + MPool pool{ channel_context }; MRepo(pool, prefix_data); const fs::u8path pkgs_dirs(ctx.prefix_params.root_prefix / "pkgs"); - MultiPackageCache package_caches({pkgs_dirs}); + MultiPackageCache package_caches({ pkgs_dirs }); auto execute_transaction = [&](MTransaction& transaction) { @@ -115,7 +115,7 @@ namespace mamba specs.end(), std::back_inserter(mspecs), [&](const auto& spec_str) { - return MatchSpec{spec_str, channel_context}; + return MatchSpec{ spec_str, channel_context }; } ); auto transaction = MTransaction(pool, mspecs, {}, package_caches); @@ -126,10 +126,10 @@ namespace mamba MSolver solver( pool, { - {SOLVER_FLAG_ALLOW_DOWNGRADE, 1}, - {SOLVER_FLAG_ALLOW_UNINSTALL, 1}, - {SOLVER_FLAG_STRICT_REPO_PRIORITY, - ctx.channel_priority == ChannelPriority::kStrict}, + { SOLVER_FLAG_ALLOW_DOWNGRADE, 1 }, + { SOLVER_FLAG_ALLOW_UNINSTALL, 1 }, + { SOLVER_FLAG_STRICT_REPO_PRIORITY, + ctx.channel_priority == ChannelPriority::kStrict }, } ); diff --git a/libmamba/src/api/repoquery.cpp b/libmamba/src/api/repoquery.cpp index e00934be73..09e2340a6b 100644 --- a/libmamba/src/api/repoquery.cpp +++ b/libmamba/src/api/repoquery.cpp @@ -33,7 +33,7 @@ namespace mamba config.load(); ChannelContext channel_context; - MPool pool{channel_context}; + MPool pool{ channel_context }; // bool installed = (type == QueryType::kDepends) || (type == QueryType::kWhoneeds); MultiPackageCache package_caches(ctx.pkgs_dirs); @@ -144,7 +144,7 @@ namespace mamba case QueryResultFormat::kRECURSIVETABLE: res.sort("name").table( std::cout, - {"Name", "Version", "Build", concat("Depends:", query), "Channel"} + { "Name", "Version", "Build", concat("Depends:", query), "Channel" } ); } if (res.empty() && format != QueryResultFormat::kJSON) diff --git a/libmamba/src/api/shell.cpp b/libmamba/src/api/shell.cpp index bd724a94ef..ab475a7946 100644 --- a/libmamba/src/api/shell.cpp +++ b/libmamba/src/api/shell.cpp @@ -95,12 +95,11 @@ namespace mamba // TODO do we need to do something wtih `shell_prefix -> root_prefix?`? if (ctx.output_params.json) { - Console::instance().json_write( - {{"success", true}, - {"operation", "shell_hook"}, - {"context", {{"shell_type", shell_type}}}, - {"actions", {{"print", {activator->hook(shell_type)}}}}} - ); + Console::instance().json_write({ { "success", true }, + { "operation", "shell_hook" }, + { "context", { { "shell_type", shell_type } } }, + { "actions", + { { "print", { activator->hook(shell_type) } } } } }); } else { diff --git a/libmamba/src/api/update.cpp b/libmamba/src/api/update.cpp index 681acd9f25..0901eb5d3f 100644 --- a/libmamba/src/api/update.cpp +++ b/libmamba/src/api/update.cpp @@ -35,7 +35,7 @@ namespace mamba // add channels from specs for (const auto& s : update_specs) { - if (auto m = MatchSpec{s, channel_context}; !m.channel.empty()) + if (auto m = MatchSpec{ s, channel_context }; !m.channel.empty()) { ctx.channels.push_back(m.channel); } @@ -43,7 +43,7 @@ namespace mamba int solver_flag = SOLVER_UPDATE; - MPool pool{channel_context}; + MPool pool{ channel_context }; MultiPackageCache package_caches(ctx.pkgs_dirs); auto exp_loaded = load_channels(pool, package_caches, 0); @@ -73,9 +73,9 @@ namespace mamba MSolver solver( pool, { - {SOLVER_FLAG_ALLOW_DOWNGRADE, ctx.allow_downgrade}, - {SOLVER_FLAG_ALLOW_UNINSTALL, ctx.allow_uninstall}, - {SOLVER_FLAG_STRICT_REPO_PRIORITY, ctx.channel_priority == ChannelPriority::kStrict}, + { SOLVER_FLAG_ALLOW_DOWNGRADE, ctx.allow_downgrade }, + { SOLVER_FLAG_ALLOW_UNINSTALL, ctx.allow_uninstall }, + { SOLVER_FLAG_STRICT_REPO_PRIORITY, ctx.channel_priority == ChannelPriority::kStrict }, } ); diff --git a/libmamba/src/core/activation.cpp b/libmamba/src/core/activation.cpp index 5b452076ac..4d816e0463 100644 --- a/libmamba/src/core/activation.cpp +++ b/libmamba/src/core/activation.cpp @@ -209,17 +209,16 @@ namespace mamba { if (on_win) { - return { - prefix, - prefix / "Library" / "mingw-w64" / "bin", - prefix / "Library" / "usr" / "bin", - prefix / "Library" / "bin", - prefix / "Scripts", - prefix / "bin"}; + return { prefix, + prefix / "Library" / "mingw-w64" / "bin", + prefix / "Library" / "usr" / "bin", + prefix / "Library" / "bin", + prefix / "Scripts", + prefix / "bin" }; } else { - return {prefix / "bin"}; + return { prefix / "bin" }; } } @@ -250,19 +249,18 @@ namespace mamba { if (on_linux) { - path = {"/usr/bin"}; + path = { "/usr/bin" }; } else if (on_mac) { - path = {"/usr/bin", "/bin", "/usr/sbin", "/sbin"}; + path = { "/usr/bin", "/bin", "/usr/sbin", "/sbin" }; } else { - path = { - "C:\\Windows\\system32", - "C:\\Windows", - "C:\\Windows\\System32\\Wbem", - "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\"}; + path = { "C:\\Windows\\system32", + "C:\\Windows", + "C:\\Windows\\System32\\Wbem", + "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\" }; } } return path; @@ -379,7 +377,7 @@ namespace mamba } else { - envt.export_vars.push_back({to_upper(k), v}); + envt.export_vars.push_back({ to_upper(k), v }); } } } @@ -425,9 +423,10 @@ namespace mamba } std::vector> env_vars_to_export = { - {"path", new_path}, - {"conda_shlvl", std::to_string(conda_shlvl)}, - {"conda_prompt_modifier", conda_prompt_modifier}}; + { "path", new_path }, + { "conda_shlvl", std::to_string(conda_shlvl) }, + { "conda_prompt_modifier", conda_prompt_modifier } + }; get_export_unset_vars(envt, env_vars_to_export); // TODO figure out if this is all really necessary? @@ -475,10 +474,11 @@ namespace mamba // script, we need something I suppose!) envt.export_path = new_path; std::vector> env_vars_to_export = { - {"conda_prefix", ""}, - {"conda_shlvl", std::to_string(new_conda_shlvl)}, - {"conda_default_env", ""}, - {"conda_prompt_modifier", ""}}; + { "conda_prefix", "" }, + { "conda_shlvl", std::to_string(new_conda_shlvl) }, + { "conda_default_env", "" }, + { "conda_prompt_modifier", "" } + }; get_export_unset_vars(envt, env_vars_to_export); } else @@ -505,16 +505,17 @@ namespace mamba } std::vector> env_vars_to_export = { - {"conda_prefix", new_prefix}, - {"conda_shlvl", std::to_string(new_conda_shlvl)}, - {"conda_default_env", conda_default_env}, - {"conda_prompt_modifier", conda_prompt_modifier}}; + { "conda_prefix", new_prefix }, + { "conda_shlvl", std::to_string(new_conda_shlvl) }, + { "conda_default_env", conda_default_env }, + { "conda_prompt_modifier", conda_prompt_modifier } + }; get_export_unset_vars(envt, env_vars_to_export); for (auto& [k, v] : new_conda_environment_env_vars) { - envt.export_vars.push_back({k, v}); + envt.export_vars.push_back({ k, v }); } envt.export_path = new_path; @@ -536,7 +537,7 @@ namespace mamba std::string save_var = fmt::format("__CONDA_SHLVL_{}_{}", new_conda_shlvl, env_var.first); if (m_env.find(save_var) != m_env.end()) { - envt.export_vars.push_back({env_var.first, m_env[save_var]}); + envt.export_vars.push_back({ env_var.first, m_env[save_var] }); envt.unset_vars.push_back(save_var); } } @@ -619,7 +620,7 @@ namespace mamba for (const auto& v : clobbering_env_vars) { conda_environment_env_vars.push_back( - {fmt::format("__CONDA_SHLVL_{}_{}", old_conda_shlvl, v), m_env[v]} + { fmt::format("__CONDA_SHLVL_{}_{}", old_conda_shlvl, v), m_env[v] } ); } @@ -632,15 +633,16 @@ namespace mamba std::string new_path = add_prefix_to_path(prefix, old_conda_shlvl); std::vector> env_vars_to_export{ - {"path", new_path}, - {"conda_prefix", prefix.string()}, - {"conda_shlvl", std::to_string(new_conda_shlvl)}, - {"conda_default_env", conda_default_env}, - {"conda_prompt_modifier", conda_prompt_modifier}}; + { "path", new_path }, + { "conda_prefix", prefix.string() }, + { "conda_shlvl", std::to_string(new_conda_shlvl) }, + { "conda_default_env", conda_default_env }, + { "conda_prompt_modifier", conda_prompt_modifier } + }; for (auto& [k, v] : conda_environment_env_vars) { - envt.export_vars.push_back({k, v}); + envt.export_vars.push_back({ k, v }); } if (old_conda_shlvl == 0) @@ -650,10 +652,9 @@ namespace mamba else if (m_stack) { get_export_unset_vars(envt, env_vars_to_export); - envt.export_vars.push_back( - {fmt::format("CONDA_PREFIX_{}", old_conda_shlvl), old_conda_prefix} - ); - envt.export_vars.push_back({fmt::format("CONDA_STACKED_{}", new_conda_shlvl), "true"}); + envt.export_vars.push_back({ fmt::format("CONDA_PREFIX_{}", old_conda_shlvl), + old_conda_prefix }); + envt.export_vars.push_back({ fmt::format("CONDA_STACKED_{}", new_conda_shlvl), "true" }); } else { @@ -670,15 +671,17 @@ namespace mamba + env_var.first; // % (new_conda_shlvl, env_var) if (m_env.find(save_var) != m_env.end()) { - envt.export_vars.insert(envt.export_vars.begin(), {env_var.first, m_env[save_var]}); + envt.export_vars.insert( + envt.export_vars.begin(), + { env_var.first, m_env[save_var] } + ); } } - env_vars_to_export[0] = {"PATH", new_path}; + env_vars_to_export[0] = { "PATH", new_path }; get_export_unset_vars(envt, env_vars_to_export); - envt.export_vars.push_back( - {fmt::format("CONDA_PREFIX_{}", old_conda_shlvl), old_conda_prefix} - ); + envt.export_vars.push_back({ fmt::format("CONDA_PREFIX_{}", old_conda_shlvl), + old_conda_prefix }); } if (Context::instance().change_ps1) @@ -819,7 +822,7 @@ namespace mamba { // Defer to powerline (https://github.com/powerline/powerline) if it's in // use. - return {"", ""}; + return { "", "" }; } auto current_prompt_modifier = env::get("CONDA_PROMPT_MODIFIER"); if (current_prompt_modifier) @@ -830,7 +833,7 @@ namespace mamba // the proper escaping of single quotes that are already part of the string. // Best solution appears to be https://stackoverflow.com/a/1250279 replace_all(ps1, "'", "'\"'\"'"); - return {"PS1", conda_prompt_modifier + ps1}; + return { "PS1", conda_prompt_modifier + ps1 }; } std::string PosixActivator::shell_extension() @@ -943,7 +946,7 @@ namespace mamba // the proper escaping of single quotes that are already part of the string. // Best solution appears to be https://stackoverflow.com/a/1250279 replace_all(prompt, "'", "'\"'\"'"); - return {"prompt", conda_prompt_modifier + prompt}; + return { "prompt", conda_prompt_modifier + prompt }; } @@ -1001,7 +1004,7 @@ namespace mamba std::pair CmdExeActivator::update_prompt(const std::string& /* conda_prompt_modifier */) { - return {"", ""}; + return { "", "" }; } std::string CmdExeActivator::script(const EnvironmentTransform& env_transform) @@ -1077,7 +1080,7 @@ namespace mamba std::pair PowerShellActivator::update_prompt(const std::string& /*conda_prompt_modifier*/) { - return {"", ""}; + return { "", "" }; } std::string PowerShellActivator::script(const EnvironmentTransform& env_transform) @@ -1145,7 +1148,7 @@ namespace mamba std::pair XonshActivator::update_prompt(const std::string& /*conda_prompt_modifier*/) { - return {"", ""}; + return { "", "" }; } std::string XonshActivator::script(const EnvironmentTransform& env_transform) @@ -1214,7 +1217,7 @@ namespace mamba std::pair FishActivator::update_prompt(const std::string& /*conda_prompt_modifier*/) { - return {"", ""}; + return { "", "" }; } std::string FishActivator::script(const EnvironmentTransform& env_transform) diff --git a/libmamba/src/core/channel.cpp b/libmamba/src/core/channel.cpp index 3ba2669d52..20ef372b1b 100644 --- a/libmamba/src/core/channel.cpp +++ b/libmamba/src/core/channel.cpp @@ -30,15 +30,15 @@ namespace mamba namespace { const std::map DEFAULT_CUSTOM_CHANNELS = { - {"pkgs/pro", "https://repo.anaconda.com"}}; + { "pkgs/pro", "https://repo.anaconda.com" } + }; const char UNKNOWN_CHANNEL[] = ""; - const std::set INVALID_CHANNELS = { - "", - "None:///", - "None", - "", - ":///"}; + const std::set INVALID_CHANNELS = { "", + "None:///", + "None", + "", + ":///" }; const char LOCAL_CHANNELS_NAME[] = "local"; const char DEFAULT_CHANNELS_NAME[] = "defaults"; @@ -46,19 +46,10 @@ namespace mamba // ATTENTION names with substrings need to go longer -> smalle // otherwise linux-ppc64 matches for linux-ppc64le etc! const std::vector KNOWN_PLATFORMS = { - "noarch", - "linux-32", - "linux-64", - "linux-aarch64", - "linux-armv6l", - "linux-armv7l", - "linux-ppc64le", - "linux-ppc64", - "osx-64", - "osx-arm64", - "win-32", - "win-64", - "zos-z"}; + "noarch", "linux-32", "linux-64", "linux-aarch64", "linux-armv6l", + "linux-armv7l", "linux-ppc64le", "linux-ppc64", "osx-64", "osx-arm64", + "win-32", "win-64", "zos-z" + }; } // namespace // Specific functions, used only in this file @@ -361,12 +352,12 @@ namespace mamba } std::string platform = m_platforms[0]; - return {{build_url( + return { { build_url( auth(), scheme(), join_url(base, name(), platform, *package_filename()), with_credential - )}}; + ) } }; } else { @@ -611,7 +602,7 @@ namespace mamba chan.name() == UNKNOWN_CHANNEL ? "" : chan.name() ); const auto& without_channel = chan.location(); - for (const auto& auth : {with_channel, without_channel}) + for (const auto& auth : { with_channel, without_channel }) { auto it = ctx.authentication_info().find(auth); if (it != ctx.authentication_info().end() @@ -731,7 +722,8 @@ namespace mamba std::vector local_channels = { Context::instance().prefix_params.target_prefix.string() + "/conda-bld", Context::instance().prefix_params.root_prefix.string() + "/conda-bld", - "~/conda-bld"}; + "~/conda-bld" + }; std::vector local_names; local_names.reserve(local_channels.size()); diff --git a/libmamba/src/core/compression.cpp b/libmamba/src/core/compression.cpp index acc99f3161..e7104234e2 100644 --- a/libmamba/src/core/compression.cpp +++ b/libmamba/src/core/compression.cpp @@ -12,8 +12,8 @@ namespace mamba { size_t ZstdStream::write(char* in, size_t size) { - ZSTD_inBuffer input = {in, size, 0}; - ZSTD_outBuffer output = {buffer, BUFFER_SIZE, 0}; + ZSTD_inBuffer input = { in, size, 0 }; + ZSTD_outBuffer output = { buffer, BUFFER_SIZE, 0 }; while (input.pos < input.size) { diff --git a/libmamba/src/core/context.cpp b/libmamba/src/core/context.cpp index 1409e481cd..b663a8cfb7 100644 --- a/libmamba/src/core/context.cpp +++ b/libmamba/src/core/context.cpp @@ -74,13 +74,12 @@ namespace mamba prefix_params.root_prefix = env::get("MAMBA_ROOT_PREFIX").value_or(""); prefix_params.conda_prefix = prefix_params.root_prefix; - envs_dirs = {prefix_params.root_prefix / "envs"}; - pkgs_dirs = { - prefix_params.root_prefix / "pkgs", - fs::u8path("~") / ".mamba" / "pkgs" + envs_dirs = { prefix_params.root_prefix / "envs" }; + pkgs_dirs = { prefix_params.root_prefix / "pkgs", + fs::u8path("~") / ".mamba" / "pkgs" #ifdef _WIN32 - , - fs::u8path(env::get("APPDATA").value_or("")) / ".mamba" / "pkgs" + , + fs::u8path(env::get("APPDATA").value_or("")) / ".mamba" / "pkgs" #endif }; @@ -168,7 +167,7 @@ namespace mamba std::vector Context::platforms() { - return {platform, "noarch"}; + return { platform, "noarch" }; } std::map& Context::authentication_info() @@ -212,7 +211,7 @@ namespace mamba token_url = token_url.substr(0, token_url.size() - 6); std::string token_content = read_contents(entry.path()); - AuthenticationInfo auth_info{AuthenticationType::kCondaToken, token_content}; + AuthenticationInfo auth_info{ AuthenticationType::kCondaToken, token_content }; m_authentication_info[token_url] = auth_info; LOG_INFO << "Found token for " << token_url << " at " << entry.path(); } diff --git a/libmamba/src/core/curl.cpp b/libmamba/src/core/curl.cpp index 8b03831a66..37f71530c4 100644 --- a/libmamba/src/core/curl.cpp +++ b/libmamba/src/core/curl.cpp @@ -592,7 +592,7 @@ namespace mamba CURLMsg* msg = curl_multi_info_read(p_handle, &msgs_in_queue); if (msg != nullptr) { - return CURLMultiResponse{msg->easy_handle, msg->data.result, msg->msg == CURLMSG_DONE}; + return CURLMultiResponse{ msg->easy_handle, msg->data.result, msg->msg == CURLMSG_DONE }; } else { diff --git a/libmamba/src/core/env_lockfile.cpp b/libmamba/src/core/env_lockfile.cpp index 20a3711b13..edcd9d9842 100644 --- a/libmamba/src/core/env_lockfile.cpp +++ b/libmamba/src/core/env_lockfile.cpp @@ -23,7 +23,7 @@ namespace mamba read_package_info(ChannelContext& channel_context, const YAML::Node& package_node) { Package package{ - /* .info = */ mamba::PackageInfo{package_node["name"].as()}, + /* .info = */ mamba::PackageInfo{ package_node["name"].as() }, /* .is_optional = */ [&] { @@ -58,7 +58,7 @@ namespace mamba } package.info.url = package_node["url"].as(); - const MatchSpec spec{package.info.url, channel_context}; + const MatchSpec spec{ package.info.url, channel_context }; package.info.fn = spec.fn; package.info.build_string = spec.build_string; package.info.subdir = spec.subdir; @@ -169,7 +169,7 @@ namespace mamba } } - return EnvironmentLockFile{std::move(metadata), std::move(packages)}; + return EnvironmentLockFile{ std::move(metadata), std::move(packages) }; } } @@ -210,7 +210,7 @@ namespace mamba file_path.string(), err.what() ), - std::type_index{typeid(err)} + std::type_index{ typeid(err) } )); } catch (...) diff --git a/libmamba/src/core/environment.cpp b/libmamba/src/core/environment.cpp index 8657656d33..7941cd6198 100644 --- a/libmamba/src/core/environment.cpp +++ b/libmamba/src/core/environment.cpp @@ -24,9 +24,9 @@ namespace mamba // See: // https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/getenv-s-wgetenv-s?view=msvc-170 static std::mutex call_mutex; - std::scoped_lock ready_to_execute{call_mutex}; // Calls to getenv_s kinds of - // functions are not thread-safe, this - // is to prevent related issues. + std::scoped_lock ready_to_execute{ call_mutex }; // Calls to getenv_s kinds of + // functions are not thread-safe, this + // is to prevent related issues. const auto on_failed = [&](errno_t error_code) { @@ -86,9 +86,9 @@ namespace mamba // See: // https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/getenv-s-wgetenv-s?view=msvc-170 static std::mutex call_mutex; - std::scoped_lock ready_to_execute{call_mutex}; // Calls to getenv_s kinds of - // functions are not thread-safe, this - // is to prevent related issues. + std::scoped_lock ready_to_execute{ call_mutex }; // Calls to getenv_s kinds of + // functions are not thread-safe, this + // is to prevent related issues. const std::wstring unicode_key = to_windows_unicode(key); const std::wstring unicode_value = to_windows_unicode(value); diff --git a/libmamba/src/core/environments_manager.cpp b/libmamba/src/core/environments_manager.cpp index a7588ae44d..8711d3c556 100644 --- a/libmamba/src/core/environments_manager.cpp +++ b/libmamba/src/core/environments_manager.cpp @@ -121,7 +121,7 @@ namespace mamba // } // else { - search_dirs = std::vector{env::home_directory()}; + search_dirs = std::vector{ env::home_directory() }; } std::set all_env_paths; diff --git a/libmamba/src/core/execution.cpp b/libmamba/src/core/execution.cpp index 5fcaee4a9c..df1e552003 100644 --- a/libmamba/src/core/execution.cpp +++ b/libmamba/src/core/execution.cpp @@ -8,7 +8,7 @@ namespace mamba void MainExecutor::invoke_close_handlers() { - std::scoped_lock lock{handlers_mutex}; + std::scoped_lock lock{ handlers_mutex }; for (auto&& handler : close_handlers) { const auto result = safe_invoke(handler); diff --git a/libmamba/src/core/fsutil.cpp b/libmamba/src/core/fsutil.cpp index ec9a4fdff4..1d7756d219 100644 --- a/libmamba/src/core/fsutil.cpp +++ b/libmamba/src/core/fsutil.cpp @@ -76,7 +76,7 @@ namespace mamba::path } } // directory exists, now create empty file - std::ofstream outfile{path.std_path(), std::ios::out}; + std::ofstream outfile{ path.std_path(), std::ios::out }; if (!outfile.good()) { @@ -147,7 +147,7 @@ namespace mamba::path } } ); - std::ofstream test_file{test_file_path.std_path(), std::ios_base::out | std::ios_base::app}; + std::ofstream test_file{ test_file_path.std_path(), std::ios_base::out | std::ios_base::app }; return test_file.is_open(); } } // namespace path diff --git a/libmamba/src/core/link.cpp b/libmamba/src/core/link.cpp index de4b5b96e3..46c98c9ca9 100644 --- a/libmamba/src/core/link.cpp +++ b/libmamba/src/core/link.cpp @@ -184,7 +184,7 @@ namespace mamba conda_exe_f.write(reinterpret_cast(conda_exe), conda_exe_len); conda_exe_f.close(); make_executable(m_context->target_prefix / script_exe); - return std::array{win_script, script_exe.string()}; + return std::array{ win_script, script_exe.string() }; #else if (!python_path.empty()) { @@ -363,14 +363,14 @@ namespace mamba prefix, Context::instance().dev, false, - {"@CALL", path.string()} + { "@CALL", path.string() } ); - command_args = {comspec.value(), "/d", "/c", script_file->path().string()}; + command_args = { comspec.value(), "/d", "/c", script_file->path().string() }; } else { - command_args = {comspec.value(), "/d", "/c", path.string()}; + command_args = { comspec.value(), "/d", "/c", path.string() }; } } @@ -391,7 +391,7 @@ namespace mamba prefix, Context::instance().dev, false, - {".", path.string()} + { ".", path.string() } ); command_args.push_back(shell_path.string()); command_args.push_back(script_file->path().string()); @@ -880,9 +880,8 @@ namespace mamba auto [sha256_in_prefix, final_path] = link_path(path, noarch_type == NoarchType::PYTHON); files_record.push_back(final_path); - nlohmann::json json_record = { - {"_path", final_path}, - {"sha256_in_prefix", sha256_in_prefix}}; + nlohmann::json json_record = { { "_path", final_path }, + { "sha256_in_prefix", sha256_in_prefix } }; if (!path.sha256.empty()) { @@ -988,7 +987,7 @@ namespace mamba out_json["extracted_package_dir"] = m_source.string(); // TODO find out what `1` means - out_json["link"] = {{"source", m_source.string()}, {"type", 1}}; + out_json["link"] = { { "source", m_source.string() }, { "type", 1 } }; if (noarch_type == NoarchType::PYTHON) { @@ -1015,9 +1014,8 @@ namespace mamba std::vector pyc_files = compile_pyc_files(for_compilation); for (const fs::u8path& pyc_path : pyc_files) { - out_json["paths_data"]["paths"].push_back( - {{"_path", pyc_path.string()}, {"path_type", "pyc_file"}} - ); + out_json["paths_data"]["paths"].push_back({ { "_path", pyc_path.string() }, + { "path_type", "pyc_file" } }); out_json["files"].push_back(pyc_path.string()); } @@ -1036,16 +1034,16 @@ namespace mamba #ifdef _WIN32 out_json["paths_data"]["paths"].push_back( - {{"_path", files[0]}, {"path_type", "windows_python_entry_point_script"}} + { { "_path", files[0] }, { "path_type", "windows_python_entry_point_script" } } ); out_json["paths_data"]["paths"].push_back( - {{"_path", files[1]}, {"path_type", "windows_python_entry_point_exe"}} + { { "_path", files[1] }, { "path_type", "windows_python_entry_point_exe" } } ); out_json["files"].push_back(files[0]); out_json["files"].push_back(files[1]); #else out_json["paths_data"]["paths"].push_back( - {{"_path", files}, {"path_type", "unix_python_entry_point"}} + { { "_path", files }, { "path_type", "unix_python_entry_point" } } ); out_json["files"].push_back(files); #endif diff --git a/libmamba/src/core/match_spec.cpp b/libmamba/src/core/match_spec.cpp index 39ec37d64a..a97dcf0c96 100644 --- a/libmamba/src/core/match_spec.cpp +++ b/libmamba/src/core/match_spec.cpp @@ -40,7 +40,7 @@ namespace mamba { std::string tmp = s; replace_all(tmp, " ", ""); - return {tmp, ""}; + return { tmp, "" }; } else { @@ -53,7 +53,7 @@ namespace mamba { std::string tmp = s; replace_all(tmp, " ", ""); - return {tmp, ""}; + return { tmp, "" }; } } // c is either ' ' or pm1 is none of the forbidden chars @@ -61,7 +61,7 @@ namespace mamba std::string v = s.substr(0, pos), b = s.substr(pos + 1); replace_all(v, " ", ""); replace_all(b, " ", ""); - return {v, b}; + return { v, b }; } } @@ -421,14 +421,9 @@ namespace mamba } std::vector check = { - "build_number", - "track_features", - "features", - "url", - "md5", - "license", - "license_family", - "fn"}; + "build_number", "track_features", "features", "url", + "md5", "license", "license_family", "fn" + }; if (!url.empty()) { diff --git a/libmamba/src/core/menuinst.cpp b/libmamba/src/core/menuinst.cpp index a32bd69df3..cab0a91202 100644 --- a/libmamba/src/core/menuinst.cpp +++ b/libmamba/src/core/menuinst.cpp @@ -168,9 +168,9 @@ namespace mamba } const std::map knownfolders = { - {"programs", FOLDERID_Programs}, - {"profile", FOLDERID_Profile}, - {"documents", FOLDERID_Documents}, + { "programs", FOLDERID_Programs }, + { "profile", FOLDERID_Profile }, + { "documents", FOLDERID_Documents }, }; fs::u8path get_folder(const std::string& id) @@ -252,13 +252,13 @@ namespace mamba } std::map vars = { - {"${PREFIX}", to_forward_slash(target_prefix)}, - {"${ROOT_PREFIX}", to_forward_slash(root_prefix)}, - {"${PY_VER}", py_ver}, - {"${MENU_DIR}", to_forward_slash(target_prefix / "Menu")}, - {"${DISTRIBUTION_NAME}", distribution_name}, - {"${ENV_NAME}", detail::get_formatted_env_name(target_prefix)}, - {"${PLATFORM}", platform_bitness}, + { "${PREFIX}", to_forward_slash(target_prefix) }, + { "${ROOT_PREFIX}", to_forward_slash(root_prefix) }, + { "${PY_VER}", py_ver }, + { "${MENU_DIR}", to_forward_slash(target_prefix / "Menu") }, + { "${DISTRIBUTION_NAME}", distribution_name }, + { "${ENV_NAME}", detail::get_formatted_env_name(target_prefix) }, + { "${PLATFORM}", platform_bitness }, }; #ifdef _WIN32 @@ -320,10 +320,10 @@ namespace mamba const fs::u8path env_pyw = target_prefix / "pythonw.exe"; const auto cwp_path = root_prefix / "cwp.py"; std::vector cwp_py_args( - {cwp_path.string(), target_prefix.string(), env_py.string()} + { cwp_path.string(), target_prefix.string(), env_py.string() } ); std::vector cwp_pyw_args( - {cwp_path.string(), target_prefix.string(), env_pyw.string()} + { cwp_path.string(), target_prefix.string(), env_pyw.string() } ); fs::u8path target_dir = win::get_folder("programs") / menu_name; @@ -374,12 +374,12 @@ namespace mamba else if (item.contains("webbrowser")) { script = root_pyw; - arguments = {"-m", "webbrowser", "-t", item["webbrowser"]}; + arguments = { "-m", "webbrowser", "-t", item["webbrowser"] }; } else if (item.contains("script")) { script = root_py; - arguments = {cwp_path.string(), target_prefix.string()}; + arguments = { cwp_path.string(), target_prefix.string() }; auto tmp = split(item["script"], " "); std::copy(tmp.begin(), tmp.end(), back_inserter(arguments)); extend_script_args(item, arguments); diff --git a/libmamba/src/core/output.cpp b/libmamba/src/core/output.cpp index 821916ed38..8e58da7554 100644 --- a/libmamba/src/core/output.cpp +++ b/libmamba/src/core/output.cpp @@ -78,7 +78,7 @@ namespace mamba void Table::add_rows(const std::string& header, const std::vector>& rs) { - m_table.push_back({header}); + m_table.push_back({ header }); for (auto& r : rs) { @@ -548,7 +548,7 @@ namespace mamba else { const std::lock_guard lock(MessageLoggerData::m_mutex); - MessageLoggerData::m_buffer.push_back({m_stream.str(), m_level}); + MessageLoggerData::m_buffer.push_back({ m_stream.str(), m_level }); } } diff --git a/libmamba/src/core/package_handling.cpp b/libmamba/src/core/package_handling.cpp index 6aba9492eb..3da665a50e 100644 --- a/libmamba/src/core/package_handling.cpp +++ b/libmamba/src/core/package_handling.cpp @@ -309,7 +309,7 @@ namespace mamba for (auto& dir_entry : fs::recursive_directory_iterator(".")) { auto clean_path = dir_entry.path().lexically_relative("./"); - files.push_back({order(clean_path), clean_path}); + files.push_back({ order(clean_path), clean_path }); } } else @@ -318,7 +318,7 @@ namespace mamba for (auto& dir_entry : fs::directory_iterator(".")) { auto clean_path = dir_entry.path().lexically_relative("./"); - files.push_back({zip_order(clean_path), clean_path}); + files.push_back({ zip_order(clean_path), clean_path }); } } @@ -740,11 +740,11 @@ namespace mamba std::vector args; if (Context::instance().command_params.is_micromamba) { - args = {get_self_exe_path().string(), "package", "extract", file.string(), dest.string()}; + args = { get_self_exe_path().string(), "package", "extract", file.string(), dest.string() }; } else { - args = {"mamba-package", "extract", file.string(), dest.string()}; + args = { "mamba-package", "extract", file.string(), dest.string() }; } std::string out, err; diff --git a/libmamba/src/core/package_paths.cpp b/libmamba/src/core/package_paths.cpp index 65989d877d..dd7b4f92c0 100644 --- a/libmamba/src/core/package_paths.cpp +++ b/libmamba/src/core/package_paths.cpp @@ -36,14 +36,13 @@ namespace mamba auto s = split(l, " "); if (s.size() == 1) { - res[s[0]] = PrefixFileParse{ - concat(PREFIX_PLACEHOLDER_1, PREFIX_PLACEHOLDER_2), - "text", - s[0]}; + res[s[0]] = PrefixFileParse{ concat(PREFIX_PLACEHOLDER_1, PREFIX_PLACEHOLDER_2), + "text", + s[0] }; } else if (s.size() == 3) { - res[s[2]] = PrefixFileParse{s[0], s[1], s[2]}; + res[s[2]] = PrefixFileParse{ s[0], s[1], s[2] }; } else { diff --git a/libmamba/src/core/pinning.cpp b/libmamba/src/core/pinning.cpp index 57d619405f..9b06c5da19 100644 --- a/libmamba/src/core/pinning.cpp +++ b/libmamba/src/core/pinning.cpp @@ -30,7 +30,7 @@ namespace mamba for (const auto& spec : specs) { - MatchSpec ms{spec, prefix_data.channel_context()}; + MatchSpec ms{ spec, prefix_data.channel_context() }; if (ms.name == "python") { return ""; diff --git a/libmamba/src/core/pool.cpp b/libmamba/src/core/pool.cpp index 3d380a22c3..a6528f07d7 100644 --- a/libmamba/src/core/pool.cpp +++ b/libmamba/src/core/pool.cpp @@ -115,7 +115,7 @@ namespace mamba std::vector MPool::select_solvables(Id matchspec, bool sorted) const { - auto solvables = pool().select_solvables({SOLVER_SOLVABLE_PROVIDES, matchspec}); + auto solvables = pool().select_solvables({ SOLVER_SOLVABLE_PROVIDES, matchspec }); if (sorted) { @@ -286,7 +286,7 @@ namespace mamba { if (const auto solv = pool().get_solvable(solv_id)) { - return {make_package_info(pool(), solv.value())}; + return { make_package_info(pool(), solv.value()) }; } return std::nullopt; } diff --git a/libmamba/src/core/prefix_data.cpp b/libmamba/src/core/prefix_data.cpp index 950fff3cee..b69eef188b 100644 --- a/libmamba/src/core/prefix_data.cpp +++ b/libmamba/src/core/prefix_data.cpp @@ -67,7 +67,7 @@ namespace mamba { LOG_DEBUG << "Adding virtual package: " << pkg.name << "=" << pkg.version << "=" << pkg.build_string; - m_package_records.insert({pkg.name, std::move(pkg)}); + m_package_records.insert({ pkg.name, std::move(pkg) }); } } @@ -99,7 +99,7 @@ namespace mamba for (const auto& dep : record->depends) { // Creating a matchspec to parse the name (there may be a channel) - auto ms = MatchSpec{dep, m_channel_context}; + auto ms = MatchSpec{ dep, m_channel_context }; // Ignoring unmatched dependencies, the environment could be broken // or it could be a matchspec const auto from_iter = name_to_node_id.find(ms.name); @@ -113,7 +113,7 @@ namespace mamba // Flip known problematic edges. // This is made to adress cycles but there is no straightforward way to make // a generic cycle handler so we instead force flip the given edges - static constexpr auto edges_to_flip = std::array{std::pair{"pip", "python"}}; + static constexpr auto edges_to_flip = std::array{ std::pair{ "pip", "python" } }; for (const auto& [from, to] : edges_to_flip) { const auto from_iter = name_to_node_id.find(from); @@ -159,6 +159,6 @@ namespace mamba nlohmann::json j; infile >> j; auto prec = PackageInfo(std::move(j)); - m_package_records.insert({prec.name, std::move(prec)}); + m_package_records.insert({ prec.name, std::move(prec) }); } } // namespace mamba diff --git a/libmamba/src/core/progress_bar_impl.cpp b/libmamba/src/core/progress_bar_impl.cpp index 971ec5d3e2..a9892115e0 100644 --- a/libmamba/src/core/progress_bar_impl.cpp +++ b/libmamba/src/core/progress_bar_impl.cpp @@ -157,7 +157,7 @@ namespace mamba // TODO: bytes sould be size_t and the implementation is wrong void to_human_readable_filesize(std::ostream& o, double bytes, std::size_t precision) { - static constexpr const char* sizes[] = {" B", "kB", "MB", "GB", "TB", "PB"}; + static constexpr const char* sizes[] = { " B", "kB", "MB", "GB", "TB", "PB" }; int order = 0; while (bytes >= 1000 && order < (6 - 1)) { @@ -861,7 +861,7 @@ namespace mamba std::vector ProgressBarRepr::fields() { - return {&prefix, &progress, ¤t, &separator, &total, &speed, &postfix, &elapsed}; + return { &prefix, &progress, ¤t, &separator, &total, &speed, &postfix, &elapsed }; } ProgressBarRepr& ProgressBarRepr::reset_fields() @@ -907,11 +907,11 @@ namespace mamba std::vector spinner; if (!m_ascii_only) { - spinner = {"⣾", "⣽", "⣻", "⢿", "⣿", "⡿", "⣟", "⣯", "⣷", "⣿"}; + spinner = { "⣾", "⣽", "⣻", "⢿", "⣿", "⡿", "⣟", "⣯", "⣷", "⣿" }; } else { - spinner = {"|", "/", "-", "|", "\\", "|", "/", "-", "|", "\\"}; + spinner = { "|", "/", "-", "|", "\\", "|", "/", "-", "|", "\\" }; } constexpr int spinner_rounds = 2; @@ -1198,7 +1198,7 @@ namespace mamba { if (m_labels.count(label) == 0) { - m_labels.insert({label, {raw_bar(progress_bar)}}); + m_labels.insert({ label, { raw_bar(progress_bar) } }); } else { @@ -1853,10 +1853,12 @@ namespace mamba std::lock_guard lock(m_mutex); if (m_aggregated_bars.count(label) == 0) { - m_aggregated_bars.insert( - {label, - std::make_unique(label, std::numeric_limits::max(), 100)} - ); + m_aggregated_bars.insert({ label, + std::make_unique( + label, + std::numeric_limits::max(), + 100 + ) }); } } diff --git a/libmamba/src/core/progress_bar_impl.hpp b/libmamba/src/core/progress_bar_impl.hpp index 1f0cf61134..aa5b36f43f 100644 --- a/libmamba/src/core/progress_bar_impl.hpp +++ b/libmamba/src/core/progress_bar_impl.hpp @@ -217,8 +217,8 @@ namespace mamba duration_t m_period = std::chrono::milliseconds(100); std::vector m_progress_bars = {}; std::map> m_labels; - std::atomic m_marked_to_terminate{false}; - std::atomic m_watch_print_started{false}; + std::atomic m_marked_to_terminate{ false }; + std::atomic m_watch_print_started{ false }; bool m_sort_bars = false; std::size_t m_width = 0; diff --git a/libmamba/src/core/query.cpp b/libmamba/src/core/query.cpp index c0deedaa4b..d3af1937d2 100644 --- a/libmamba/src/core/query.cpp +++ b/libmamba/src/core/query.cpp @@ -52,7 +52,7 @@ namespace mamba { solv::ObjQueue rec_solvables = {}; // the following prints the requested version - solv::ObjQueue job = {SOLVER_SOLVABLE_PROVIDES, req}; + solv::ObjQueue job = { SOLVER_SOLVABLE_PROVIDES, req }; selection_solvables(pool, job.raw(), rec_solvables.raw()); if (rec_solvables.size() != 0) @@ -255,7 +255,7 @@ namespace mamba throw std::runtime_error("Could not generate query for " + query); } - solv::ObjQueue job = {SOLVER_SOLVABLE_PROVIDES, id}; + solv::ObjQueue job = { SOLVER_SOLVABLE_PROVIDES, id }; query_result::dependency_graph g; if (tree) @@ -268,7 +268,7 @@ namespace mamba assert(pkg_info.has_value()); const auto node_id = g.add_node(std::move(pkg_info).value()); Solvable* const latest = pool_id2solvable(m_pool.get(), solvables.front()); - std::map visited = {{latest, node_id}}; + std::map visited = { { latest, node_id } }; reverse_walk_graph(m_pool, g, node_id, latest, visited); } } @@ -323,7 +323,7 @@ namespace mamba assert(pkg_info.has_value()); const auto node_id = g.add_node(std::move(pkg_info).value()); - std::map visited = {{latest, node_id}}; + std::map visited = { { latest, node_id } }; std::map not_found; walk_graph(m_pool, g, node_id, latest, visited, not_found, depth); } @@ -408,7 +408,7 @@ namespace mamba std::ostream& query_result::table(std::ostream& out) const { - return table(out, {"Name", "Version", "Build", "Channel"}); + return table(out, { "Name", "Version", "Build", "Channel" }); } namespace @@ -631,13 +631,12 @@ namespace mamba std::string query_type = m_type == QueryType::kSEARCH ? "search" : (m_type == QueryType::kDEPENDS ? "depends" : "whoneeds"); - j["query"] = { - {"query", MatchSpec{m_query, channel_context}.conda_build_form()}, - {"type", query_type}}; + j["query"] = { { "query", MatchSpec{ m_query, channel_context }.conda_build_form() }, + { "type", query_type } }; std::string msg = m_pkg_id_list.empty() ? "No entries matching \"" + m_query + "\" found" : ""; - j["result"] = {{"msg", msg}, {"status", "OK"}}; + j["result"] = { { "msg", msg }, { "status", "OK" } }; j["result"]["pkgs"] = nlohmann::json::array(); for (size_t i = 0; i < m_pkg_id_list.size(); ++i) diff --git a/libmamba/src/core/repo.cpp b/libmamba/src/core/repo.cpp index 2efdce8f04..78e8a32bf6 100644 --- a/libmamba/src/core/repo.cpp +++ b/libmamba/src/core/repo.cpp @@ -77,12 +77,12 @@ namespace mamba // Keeping the solv-cpp header private auto srepo(const MRepo& r) -> solv::ObjRepoViewConst { - return solv::ObjRepoViewConst{*const_cast(r.repo())}; + return solv::ObjRepoViewConst{ *const_cast(r.repo()) }; } auto srepo(MRepo& r) -> solv::ObjRepoView { - return solv::ObjRepoView{*r.repo()}; + return solv::ObjRepoView{ *r.repo() }; } } diff --git a/libmamba/src/core/run.cpp b/libmamba/src/core/run.cpp index afe3c165be..e3ea5c5714 100644 --- a/libmamba/src/core/run.cpp +++ b/libmamba/src/core/run.cpp @@ -62,17 +62,11 @@ namespace mamba }; static std::vector alt_names{ - "program", - "application", - "app", - "code", - "blob", - "binary", - "script", + "program", "application", "app", "code", "blob", "binary", "script", }; static std::vector prefixes_bag(prefixes.cbegin(), prefixes.cend()); - std::string selected_name{program_name}; + std::string selected_name{ program_name }; while (true) { std::string selected_prefix; @@ -138,7 +132,8 @@ namespace mamba proc_dir_path.string(), error->what() ), - mamba_error_code::lockfile_failure}; + mamba_error_code::lockfile_failure + }; } else { @@ -157,7 +152,7 @@ namespace mamba const auto open_mode = std::ios::binary | std::ios::in; - for (auto&& entry : fs::directory_iterator{proc_dir()}) + for (auto&& entry : fs::directory_iterator{ proc_dir() }) { const auto file_location = entry.path(); if (file_location.extension() != ".json") @@ -165,7 +160,7 @@ namespace mamba continue; } - std::ifstream pid_file{file_location.std_path(), open_mode}; + std::ifstream pid_file{ file_location.std_path(), open_mode }; if (!pid_file.is_open()) { LOG_WARNING << fmt::format("failed to open {}", file_location.string()); @@ -196,7 +191,7 @@ namespace mamba const std::vector& command, LockFile proc_dir_lock ) - : location{proc_dir() / fmt::format("{}.json", getpid())} + : location{ proc_dir() / fmt::format("{}.json", getpid()) } { // Lock must be hold for the duraction of this constructor. if (is_file_locking_allowed()) @@ -401,7 +396,7 @@ namespace mamba if (specific_process_name.empty()) { const auto unique_name = generate_unique_process_name(*exe_name_it); - command.insert(exe_name_it, {{"-a"}, unique_name}); + command.insert(exe_name_it, { { "-a" }, unique_name }); return unique_name; } else @@ -413,7 +408,7 @@ namespace mamba specific_process_name )); } - command.insert(exe_name_it, {{"-a"}, specific_process_name}); + command.insert(exe_name_it, { { "-a" }, specific_process_name }); return specific_process_name; } }(); @@ -454,12 +449,10 @@ namespace mamba { LOG_INFO << "Received SIGTERM on micromamba run - terminating process"; reproc::stop_actions sa; - sa.first = reproc::stop_action{ - reproc::stop::terminate, - std::chrono::milliseconds(3000)}; - sa.second = reproc::stop_action{ - reproc::stop::kill, - std::chrono::milliseconds(3000)}; + sa.first = reproc::stop_action{ reproc::stop::terminate, + std::chrono::milliseconds(3000) }; + sa.second = reproc::stop_action{ reproc::stop::kill, + std::chrono::milliseconds(3000) }; proc.stop(sa); } ); diff --git a/libmamba/src/core/satisfiability_error.cpp b/libmamba/src/core/satisfiability_error.cpp index fa75c5d59d..4e8b56565e 100644 --- a/libmamba/src/core/satisfiability_error.cpp +++ b/libmamba/src/core/satisfiability_error.cpp @@ -118,7 +118,7 @@ namespace mamba } } } - return {std::move(graph), std::move(conflicts), pbs.root_node()}; + return { std::move(graph), std::move(conflicts), pbs.root_node() }; } /*********************************************** @@ -433,7 +433,7 @@ namespace mamba old_to_new ); } - return std::tuple{std::move(new_graph), new_root_node, std::move(old_to_new)}; + return std::tuple{ std::move(new_graph), new_root_node, std::move(old_to_new) }; } /** @@ -509,7 +509,7 @@ namespace mamba } merge_edges(pbs.graph(), graph, old_to_new); auto conflicts = merge_conflicts(pbs.conflicts(), old_to_new); - return {std::move(graph), std::move(conflicts), root_node}; + return { std::move(graph), std::move(conflicts), root_node }; } CompressedProblemsGraph::CompressedProblemsGraph(graph_t graph, conflicts_t conflicts, node_id root_node) @@ -661,7 +661,7 @@ namespace mamba { versions.erase(std::unique(versions.begin(), versions.end()), versions.end()); } - return {join_trunc(versions, sep, etc, threshold), versions.size()}; + return { join_trunc(versions, sep, etc, threshold), versions.size() }; } template @@ -684,7 +684,7 @@ namespace mamba { builds.erase(std::unique(builds.begin(), builds.end()), builds.end()); } - return {join_trunc(builds, sep, etc, threshold), builds.size()}; + return { join_trunc(builds, sep, etc, threshold), builds.size() }; } template @@ -714,7 +714,7 @@ namespace mamba versions_builds.end() ); } - return {join_trunc(versions_builds, sep, etc, threshold), versions_builds.size()}; + return { join_trunc(versions_builds, sep, etc, threshold), versions_builds.size() }; } template @@ -1067,7 +1067,7 @@ namespace mamba out = children_begin; } - return {out, ongoing.status}; + return { out, ongoing.status }; } auto TreeDFS::visit_node(node_id root_id, TreeNodeIter out) -> std::pair @@ -1075,8 +1075,8 @@ namespace mamba auto& ongoing = *(out++); ongoing = TreeNode{ /* .ancestry= */ {}, - /* .ids= */ {root_id}, - /* .ids_from= */ {root_id}, + /* .ids= */ { root_id }, + /* .ids_from= */ { root_id }, /* .type= */ node_type(root_id), /* .type_from= */ node_type(root_id), /* .status= */ {}, // Placeholder updated @@ -1094,7 +1094,7 @@ namespace mamba auto& ongoing = *(out++); ongoing = TreeNode{ /* .ancestry= */ concat(from.ancestry, position), - /* .ids= */ {id}, + /* .ids= */ { id }, /* .ids_from= */ from.ids, /* .type= */ node_type(id), /* .type_from= */ from.type, @@ -1116,7 +1116,7 @@ namespace mamba if (const auto status = m_node_visited[id]; status.has_value()) { - return {out, status.value()}; + return { out, status.value() }; } Status status = true; @@ -1151,7 +1151,7 @@ namespace mamba status = !node_not_installable(id) && status; m_node_visited[id] = status; - return {out, status}; + return { out, status }; } /** diff --git a/libmamba/src/core/shell_init.cpp b/libmamba/src/core/shell_init.cpp index e41352705e..c22625005d 100644 --- a/libmamba/src/core/shell_init.cpp +++ b/libmamba/src/core/shell_init.cpp @@ -97,7 +97,7 @@ namespace mamba #ifdef _WIN32 std::wstring get_autorun_registry_key(const std::wstring& reg_path) { - winreg::RegKey key{HKEY_CURRENT_USER, reg_path}; + winreg::RegKey key{ HKEY_CURRENT_USER, reg_path }; std::wstring content; try { @@ -119,7 +119,7 @@ namespace mamba fmt::styled(to_utf8(value), Context::instance().graphics_params.palette.success) ); - winreg::RegKey key{HKEY_CURRENT_USER, reg_path}; + winreg::RegKey key{ HKEY_CURRENT_USER, reg_path }; key.SetStringValue(L"AutoRun", value); } @@ -253,7 +253,7 @@ namespace mamba std::string out, err; try { - std::vector args{command, path}; + std::vector args{ command, path }; if (is_a_path_env) { args.push_back("--path"); @@ -654,12 +654,11 @@ namespace mamba auto scripts_activate_bat = root_prefix / "Scripts" / "activate.bat"; auto mamba_hook_bat = root_prefix / "condabin" / "mamba_hook.bat"; - for (auto& f : - {micromamba_bat, - _mamba_activate_bat, - condabin_activate_bat, - scripts_activate_bat, - mamba_hook_bat}) + for (auto& f : { micromamba_bat, + _mamba_activate_bat, + condabin_activate_bat, + scripts_activate_bat, + mamba_hook_bat }) { if (fs::exists(f)) { @@ -675,7 +674,7 @@ namespace mamba // remove condabin and Scripts if empty auto condabin = root_prefix / "condabin"; auto scripts = root_prefix / "Scripts"; - for (auto& d : {condabin, scripts}) + for (auto& d : { condabin, scripts }) { if (fs::exists(d) && fs::is_empty(d)) { @@ -989,7 +988,7 @@ namespace mamba { std::string out, err; auto [status, ec] = reproc::run( - std::vector{exe, "-NoProfile", "-Command", profile_var}, + std::vector{ exe, "-NoProfile", "-Command", profile_var }, reproc::options{}, reproc::sink::string(out), reproc::sink::string(err) @@ -1055,7 +1054,7 @@ namespace mamba else if (shell == "powershell") { std::set pwsh_profiles; - for (auto& exe : std::vector{"powershell", "pwsh", "pwsh-preview"}) + for (auto& exe : std::vector{ "powershell", "pwsh", "pwsh-preview" }) { auto profile_path = find_powershell_paths(exe); if (!profile_path.empty()) @@ -1123,7 +1122,7 @@ namespace mamba else if (shell == "powershell") { std::set pwsh_profiles; - for (auto& exe : std::vector{"powershell", "pwsh", "pwsh-preview"}) + for (auto& exe : std::vector{ "powershell", "pwsh", "pwsh-preview" }) { auto profile_path = find_powershell_paths(exe); if (!profile_path.empty()) @@ -1173,7 +1172,7 @@ namespace mamba fs::u8path home = env::home_directory(); std::vector result; - std::vector supported_shells = {"bash", "zsh", "xonsh", "csh", "fish"}; + std::vector supported_shells = { "bash", "zsh", "xonsh", "csh", "fish" }; for (const std::string& shell : supported_shells) { fs::u8path config_path = config_path_for_shell(shell); @@ -1199,7 +1198,7 @@ namespace mamba // powershell { std::set pwsh_profiles; - for (auto& exe : std::vector{"powershell", "pwsh", "pwsh-preview"}) + for (auto& exe : std::vector{ "powershell", "pwsh", "pwsh-preview" }) { auto profile_path = find_powershell_paths(exe); if (!profile_path.empty() && fs::exists(profile_path)) diff --git a/libmamba/src/core/singletons.cpp b/libmamba/src/core/singletons.cpp index f501802845..b0bf5006ac 100644 --- a/libmamba/src/core/singletons.cpp +++ b/libmamba/src/core/singletons.cpp @@ -104,7 +104,7 @@ namespace mamba //--- Concurrency resources / thread-handling //------------------------------------------------------------------ - static std::atomic main_executor{nullptr}; + static std::atomic main_executor{ nullptr }; static std::unique_ptr default_executor; static std::mutex default_executor_mutex; // TODO: replace by sychronized_value once available @@ -114,7 +114,7 @@ namespace mamba if (!main_executor) { // When no MainExecutor was created before we create a static one. - std::scoped_lock lock{default_executor_mutex}; + std::scoped_lock lock{ default_executor_mutex }; if (!main_executor) // double check necessary to avoid data race { default_executor = std::make_unique(); @@ -127,7 +127,7 @@ namespace mamba void MainExecutor::stop_default() { - std::scoped_lock lock{default_executor_mutex}; + std::scoped_lock lock{ default_executor_mutex }; default_executor.reset(); } diff --git a/libmamba/src/core/solver.cpp b/libmamba/src/core/solver.cpp index bb3861579b..ba81add640 100644 --- a/libmamba/src/core/solver.cpp +++ b/libmamba/src/core/solver.cpp @@ -121,7 +121,7 @@ namespace mamba { for (const auto& job : jobs) { - MatchSpec ms{job, m_pool.channel_context()}; + MatchSpec ms{ job, m_pool.channel_context() }; int job_type = job_flag & SOLVER_JOBMASK; if (job_type & SOLVER_INSTALL) @@ -167,7 +167,7 @@ namespace mamba { m_jobs->push_back( SOLVER_INSTALL | SOLVER_SOLVABLE_PROVIDES, - m_pool.matchspec2id({job, m_pool.channel_context()}) + m_pool.matchspec2id({ job, m_pool.channel_context() }) ); } @@ -199,7 +199,7 @@ namespace mamba // as one of its constrains. // Then we lock this solvable and force the re-checking of its dependencies. - const auto pin_ms = MatchSpec{pin, m_pool.channel_context()}; + const auto pin_ms = MatchSpec{ pin, m_pool.channel_context() }; m_pinned_specs.push_back(pin_ms); auto& pool = m_pool.pool(); @@ -219,7 +219,7 @@ namespace mamba std::string const cons_solv_name = fmt::format("pin-{}", m_pinned_specs.size()); cons_solv.set_name(cons_solv_name); cons_solv.set_version("1"); - cons_solv.add_constraints(solv::ObjQueue{m_pool.matchspec2id(pin_ms)}); + cons_solv.add_constraints(solv::ObjQueue{ m_pool.matchspec2id(pin_ms) }); // Solvable need to provide itself cons_solv.add_self_provide(); @@ -230,7 +230,7 @@ namespace mamba // Lock the dummy solvable so that it stays install. // Force verify the dummy solvable dependencies, as this is not the default for // installed packages. - return add_jobs({cons_solv_name}, SOLVER_LOCK & SOLVER_VERIFY); + return add_jobs({ cons_solv_name }, SOLVER_LOCK & SOLVER_VERIFY); } void MSolver::add_pins(const std::vector& pins) @@ -317,7 +317,7 @@ namespace mamba const bool success = solver().solve(m_pool.pool(), *m_jobs); m_is_solved = true; LOG_INFO << "Problem count: " << solver().problem_count(); - Console::instance().json_write({{"success", success}}); + Console::instance().json_write({ { "success", success } }); return success; } @@ -417,8 +417,8 @@ namespace mamba print_problem_tree_msg( out, cp_pbs, - {/* .unavailable= */ ctx.graphics_params.palette.failure, - /* .available= */ ctx.graphics_params.palette.success} + { /* .unavailable= */ ctx.graphics_params.palette.failure, + /* .available= */ ctx.graphics_params.palette.success } ); return out; } @@ -504,8 +504,8 @@ namespace mamba }; ProblemsGraphCreator::ProblemsGraphCreator(const MSolver& solver, const MPool& pool) - : m_solver{solver} - , m_pool{pool} + : m_solver{ solver } + , m_pool{ pool } { m_root_node = m_graph.add_node(RootNode()); parse_problems(); @@ -513,7 +513,7 @@ namespace mamba ProblemsGraph ProblemsGraphCreator::problem_graph() && { - return {std::move(m_graph), std::move(m_conflicts), m_root_node}; + return { std::move(m_graph), std::move(m_conflicts), m_root_node }; } auto ProblemsGraphCreator::add_solvable(solv::SolvableId solv_id, node_t&& node, bool update) @@ -550,7 +550,7 @@ namespace mamba added = true; auto pkg_info = m_pool.id2pkginfo(solv_id); assert(pkg_info.has_value()); - node_id to_id = add_solvable(solv_id, PackageNode{std::move(pkg_info).value()}, false); + node_id to_id = add_solvable(solv_id, PackageNode{ std::move(pkg_info).value() }, false); m_graph.add_edge(from_id, to_id, edge); } return added; @@ -581,15 +581,15 @@ namespace mamba } auto src_id = add_solvable( problem.source_id, - PackageNode{std::move(source).value()} + PackageNode{ std::move(source).value() } ); node_id tgt_id = add_solvable( problem.target_id, - PackageNode{std::move(target).value()} + PackageNode{ std::move(target).value() } ); node_id cons_id = add_solvable( problem.dep_id, - ConstraintNode{{dep.value(), channel_context}} + ConstraintNode{ { dep.value(), channel_context } } ); MatchSpec edge(dep.value(), channel_context); m_graph.add_edge(src_id, cons_id, std::move(edge)); @@ -609,7 +609,7 @@ namespace mamba } auto src_id = add_solvable( problem.source_id, - PackageNode{std::move(source).value()} + PackageNode{ std::move(source).value() } ); MatchSpec edge(dep.value(), channel_context); bool added = add_expanded_deps_edges(src_id, problem.dep_id, edge); @@ -652,7 +652,7 @@ namespace mamba MatchSpec edge(dep.value(), channel_context); node_id dep_id = add_solvable( problem.dep_id, - UnresolvedDependencyNode{{std::move(dep).value(), channel_context}} + UnresolvedDependencyNode{ { std::move(dep).value(), channel_context } } ); m_graph.add_edge(m_root_node, dep_id, std::move(edge)); break; @@ -671,11 +671,11 @@ namespace mamba MatchSpec edge(dep.value(), channel_context); node_id src_id = add_solvable( problem.source_id, - PackageNode{std::move(source).value()} + PackageNode{ std::move(source).value() } ); node_id dep_id = add_solvable( problem.dep_id, - UnresolvedDependencyNode{{std::move(dep).value(), channel_context}} + UnresolvedDependencyNode{ { std::move(dep).value(), channel_context } } ); m_graph.add_edge(src_id, dep_id, std::move(edge)); break; @@ -694,11 +694,11 @@ namespace mamba } node_id src_id = add_solvable( problem.source_id, - PackageNode{std::move(source).value()} + PackageNode{ std::move(source).value() } ); node_id tgt_id = add_solvable( problem.target_id, - PackageNode{std::move(target).value()} + PackageNode{ std::move(target).value() } ); add_conflict(src_id, tgt_id); break; diff --git a/libmamba/src/core/subdirdata.cpp b/libmamba/src/core/subdirdata.cpp index 7dfc74eaa8..54fd4ba2bd 100644 --- a/libmamba/src/core/subdirdata.cpp +++ b/libmamba/src/core/subdirdata.cpp @@ -63,9 +63,8 @@ namespace mamba { if (contains(c, channel->location()) && contains(c, channel->name())) { - has_zst = { - true, - std::chrono::system_clock::to_time_t(std::chrono::system_clock::now())}; + has_zst = { true, + std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) }; return true; break; } @@ -138,7 +137,8 @@ namespace mamba { m.has_zst = { j["has_zst"]["value"].get(), - parse_utc_timestamp(j["has_zst"]["last_checked"].get(), err_code)}; + parse_utc_timestamp(j["has_zst"]["last_checked"].get(), err_code) + }; } } catch (const std::exception& e) @@ -462,7 +462,7 @@ namespace mamba if (ends_with(target.get_url(), ".zst")) { - this->m_metadata.has_zst = {target.get_http_status() == 200, utc_time_now()}; + this->m_metadata.has_zst = { target.get_http_status() == 200, utc_time_now() }; } return true; } @@ -598,30 +598,33 @@ namespace mamba auto& ctx = Context::instance(); if (!ctx.offline || forbid_cache()) { - bool has_value = m_metadata.has_zst.has_value(); - bool is_expired = m_metadata.has_zst.has_value() - && m_metadata.has_zst.value().has_expired(); - bool has_zst = m_metadata.check_zst(p_channel); - if (!has_zst && (is_expired || !has_value)) + if (ctx.repodata_use_zst) { - m_check_targets.push_back(std::make_unique( - m_name + " (check zst)", - m_repodata_url + ".zst", - "" - )); - m_check_targets.back()->set_head_only(true); - m_check_targets.back()->set_finalize_callback(&MSubdirData::finalize_check, this); - m_check_targets.back()->set_ignore_failure(true); - if (!(ctx.graphics_params.no_progress_bars || ctx.output_params.quiet - || ctx.output_params.json)) + bool has_value = m_metadata.has_zst.has_value(); + bool is_expired = m_metadata.has_zst.has_value() + && m_metadata.has_zst.value().has_expired(); + bool has_zst = m_metadata.check_zst(p_channel); + if (!has_zst && (is_expired || !has_value)) { - m_progress_bar_check = Console::instance().add_progress_bar( - m_name + " (check zst)" - ); - m_check_targets.back()->set_progress_bar(m_progress_bar_check); - m_progress_bar_check.repr().postfix.set_value("Checking"); + m_check_targets.push_back(std::make_unique( + m_name + " (check zst)", + m_repodata_url + ".zst", + "" + )); + m_check_targets.back()->set_head_only(true); + m_check_targets.back()->set_finalize_callback(&MSubdirData::finalize_check, this); + m_check_targets.back()->set_ignore_failure(true); + if (!(ctx.graphics_params.no_progress_bars || ctx.output_params.quiet + || ctx.output_params.json)) + { + m_progress_bar_check = Console::instance().add_progress_bar( + m_name + " (check zst)" + ); + m_check_targets.back()->set_progress_bar(m_progress_bar_check); + m_progress_bar_check.repr().postfix.set_value("Checking"); + } + return true; } - return true; } create_target(); } @@ -673,12 +676,15 @@ namespace mamba m_solv_cache_valid = true; } - auto state_file = json_file; - state_file.replace_extension(".state.json"); - auto lock = LockFile(state_file); - m_metadata.store_file_metadata(json_file); - auto outf = open_ofstream(state_file); - m_metadata.serialize_to_stream(outf); + if (Context::instance().repodata_use_zst) + { + auto state_file = json_file; + state_file.replace_extension(".state.json"); + auto lock = LockFile(state_file); + m_metadata.store_file_metadata(json_file); + auto outf = open_ofstream(state_file); + m_metadata.serialize_to_stream(outf); + } } bool MSubdirData::finalize_transfer(const DownloadTarget&) @@ -811,28 +817,79 @@ namespace mamba m_metadata.cache_control = m_target->get_cache_control(); m_metadata.stored_file_size = file_size; - fs::u8path state_file = json_file; - state_file.replace_extension(".state.json"); - std::error_code ec; - mamba_fs::rename_or_move(m_temp_file->path(), json_file, ec); - if (ec) + if (!Context::instance().repodata_use_zst) { - throw mamba_error( - fmt::format( - "Could not move repodata file from {} to {}: {}", - m_temp_file->path(), - json_file, - strerror(errno) - ), - mamba_error_code::subdirdata_not_loaded + LOG_DEBUG << "Opening '" << json_file.string() << "'"; + path::touch(json_file, true); + std::ofstream final_file = open_ofstream(json_file); + + if (!final_file.is_open()) + { + throw mamba_error( + fmt::format("Could not open file '{}'", json_file.string()), + mamba_error_code::subdirdata_not_loaded + ); + } + + if (m_progress_bar) + { + m_progress_bar.set_postfix("Finalizing"); + } + + std::ifstream temp_file = open_ifstream(m_temp_file->path()); + std::stringstream temp_json; + m_metadata.serialize_to_stream_tiny(temp_json); + + // replace `}` with `,` + temp_json.seekp(-1, temp_json.cur); + temp_json << ','; + final_file << temp_json.str(); + temp_file.seekg(1); + std::copy( + std::istreambuf_iterator(temp_file), + std::istreambuf_iterator(), + std::ostreambuf_iterator(final_file) ); - } - fs::last_write_time(json_file, fs::now()); - m_metadata.store_file_metadata(json_file); - std::ofstream state_file_stream = open_ofstream(state_file); - m_metadata.serialize_to_stream(state_file_stream); + if (!temp_file) + { + std::error_code ec; + fs::remove(json_file, ec); + if (ec) + { + LOG_ERROR << "Could not remove file " << json_file << ": " << ec.message(); + } + throw mamba_error( + fmt::format("Could not write out repodata file {}: {}", json_file, strerror(errno)), + mamba_error_code::subdirdata_not_loaded + ); + } + fs::last_write_time(json_file, fs::now()); + } + else + { + fs::u8path state_file = json_file; + state_file.replace_extension(".state.json"); + std::error_code ec; + mamba_fs::rename_or_move(m_temp_file->path(), json_file, ec); + if (ec) + { + throw mamba_error( + fmt::format( + "Could not move repodata file from {} to {}: {}", + m_temp_file->path(), + json_file, + strerror(errno) + ), + mamba_error_code::subdirdata_not_loaded + ); + } + fs::last_write_time(json_file, fs::now()); + m_metadata.store_file_metadata(json_file); + std::ofstream state_file_stream = open_ofstream(state_file); + m_metadata.serialize_to_stream(state_file_stream); + } if (m_progress_bar) { m_progress_bar.repr().postfix.set_value("Downloaded").deactivate(); diff --git a/libmamba/src/core/transaction.cpp b/libmamba/src/core/transaction.cpp index a3139e42f8..b69ee2baa8 100644 --- a/libmamba/src/core/transaction.cpp +++ b/libmamba/src/core/transaction.cpp @@ -140,7 +140,7 @@ namespace mamba // TODO why is this only using the last job? const auto q = m_pool.pool().select_solvables(job); const bool remove_success = q.size() >= specs_to_remove.size(); - Console::instance().json_write({{"success", remove_success}}); + Console::instance().json_write({ { "success", remove_success } }); // find repo __explicit_specs__ and install all packages from it auto repo = solv::ObjRepoView(*mrepo.repo()); @@ -169,7 +169,7 @@ namespace mamba { Console::instance().json_down("actions"); Console::instance().json_write( - {{"PREFIX", Context::instance().prefix_params.target_prefix.string()}} + { { "PREFIX", Context::instance().prefix_params.target_prefix.string() } } ); } @@ -227,7 +227,7 @@ namespace mamba add_spec += version; } m_history_entry.update.push_back( - MatchSpec{add_spec, m_pool.channel_context()}.str() + MatchSpec{ add_spec, m_pool.channel_context() }.str() ); } } @@ -259,7 +259,7 @@ namespace mamba { Console::instance().json_down("actions"); Console::instance().json_write( - {{"PREFIX", Context::instance().prefix_params.target_prefix.string()}} + { { "PREFIX", Context::instance().prefix_params.target_prefix.string() } } ); } @@ -558,12 +558,12 @@ namespace mamba { Console::instance().json_up(); } - Console::instance().json_write( - {{"dry_run", ctx.dry_run}, {"prefix", ctx.prefix_params.target_prefix.string()}} - ); + Console::instance().json_write({ { "dry_run", ctx.dry_run }, + { "prefix", ctx.prefix_params.target_prefix.string() } }); if (empty()) { - Console::instance().json_write({{"message", "All requested packages already installed"}}); + Console::instance().json_write({ { "message", + "All requested packages already installed" } }); } if (ctx.dry_run) @@ -1065,15 +1065,13 @@ namespace mamba Console::instance().print(" No specs added or removed.\n"); } - printers::Table t({"Package", "Version", "Build", "Channel", "Size"}); - t.set_alignment( - {printers::alignment::left, - printers::alignment::right, - printers::alignment::left, - printers::alignment::left, - printers::alignment::right} - ); - t.set_padding({2, 2, 2, 2, 5}); + printers::Table t({ "Package", "Version", "Build", "Channel", "Size" }); + t.set_alignment({ printers::alignment::left, + printers::alignment::right, + printers::alignment::left, + printers::alignment::left, + printers::alignment::right }); + t.set_padding({ 2, 2, 2, 2, 5 }); solv::ObjQueue classes = {}; solv::ObjQueue pkgs = {}; @@ -1156,13 +1154,11 @@ namespace mamba assert(chan_name != "__explicit_specs__"); } - r.push_back( - {name, - printers::FormattedString(std::string(s.version())), - printers::FormattedString(std::string(s.build_string())), - printers::FormattedString(cut_repo_name(chan_name)), - dlsize_s} - ); + r.push_back({ name, + printers::FormattedString(std::string(s.version())), + printers::FormattedString(std::string(s.build_string())), + printers::FormattedString(cut_repo_name(chan_name)), + dlsize_s }); }; const auto& pool = m_pool.pool(); @@ -1270,7 +1266,7 @@ namespace mamba summary << "\n Total download: "; to_human_readable_filesize(summary, double(total_size)); summary << "\n"; - t.add_row({summary.str()}); + t.add_row({ summary.str() }); auto out = Console::stream(); t.print(out); } @@ -1369,11 +1365,11 @@ namespace mamba pip_specs.push_back(package.name + " @ " + package.url + "#sha256=" + package.sha256); } other_specs.push_back( - {"pip --no-deps", pip_specs, fs::absolute(env_lockfile_path.parent_path()).string()} + { "pip --no-deps", pip_specs, fs::absolute(env_lockfile_path.parent_path()).string() } ); } - return MTransaction{pool, packages.conda, package_caches}; + return MTransaction{ pool, packages.conda, package_caches }; } } // namespace mamba diff --git a/libmamba/src/core/transaction_context.cpp b/libmamba/src/core/transaction_context.cpp index 5d1f90fd69..cf3fae8483 100644 --- a/libmamba/src/core/transaction_context.cpp +++ b/libmamba/src/core/transaction_context.cpp @@ -191,8 +191,9 @@ namespace mamba std::signal(SIGPIPE, SIG_IGN); #endif const auto complete_python_path = target_prefix / python_path; - std::vector - command = {complete_python_path.string(), "-Wi", "-m", "compileall", "-q", "-l", "-i", "-"}; + std::vector command = { + complete_python_path.string(), "-Wi", "-m", "compileall", "-q", "-l", "-i", "-" + }; auto py_ver_split = split(python_version, "."); @@ -205,11 +206,10 @@ namespace mamba compile_python_sources(compileall_f); compileall_f.close(); - command = { - complete_python_path.string(), - "-Wi", - "-u", - m_pyc_compileall->path().string()}; + command = { complete_python_path.string(), + "-Wi", + "-u", + m_pyc_compileall->path().string() }; } } catch (const std::exception& e) @@ -235,9 +235,9 @@ namespace mamba options.env.extra = envmap; options.stop = { - {reproc::stop::wait, reproc::milliseconds(10000)}, - {reproc::stop::terminate, reproc::milliseconds(5000)}, - {reproc::stop::kill, reproc::milliseconds(2000)}, + { reproc::stop::wait, reproc::milliseconds(10000) }, + { reproc::stop::terminate, reproc::milliseconds(5000) }, + { reproc::stop::kill, reproc::milliseconds(2000) }, }; options.redirect.out.type = reproc::redirect::pipe; @@ -321,9 +321,9 @@ namespace mamba int status = 0; std::tie(status, ec) = m_pyc_process->stop({ - {reproc::stop::wait, reproc::milliseconds(100000)}, - {reproc::stop::terminate, reproc::milliseconds(5000)}, - {reproc::stop::kill, reproc::milliseconds(2000)}, + { reproc::stop::wait, reproc::milliseconds(100000) }, + { reproc::stop::terminate, reproc::milliseconds(5000) }, + { reproc::stop::kill, reproc::milliseconds(2000) }, }); if (ec || status != 0) { diff --git a/libmamba/src/core/url.cpp b/libmamba/src/core/url.cpp index a4436adc65..356cf79351 100644 --- a/libmamba/src/core/url.cpp +++ b/libmamba/src/core/url.cpp @@ -479,18 +479,10 @@ namespace mamba namespace { - const std::vector CURLUPART_NAMES = { - "url", - "scheme", - "user", - "password", - "options", - "host", - "port", - "path", - "query", - "fragment", - "zoneid"}; + const std::vector CURLUPART_NAMES = { "url", "scheme", "user", + "password", "options", "host", + "port", "path", "query", + "fragment", "zoneid" }; } std::string URLHandler::get_part(CURLUPart part) const diff --git a/libmamba/src/core/util.cpp b/libmamba/src/core/util.cpp index c242eb4e12..1b605d499c 100644 --- a/libmamba/src/core/util.cpp +++ b/libmamba/src/core/util.cpp @@ -981,7 +981,7 @@ namespace mamba } const auto absolute_file_path = fs::absolute(file_path); - std::scoped_lock lock{mutex}; + std::scoped_lock lock{ mutex }; const auto it = locked_files.find(absolute_file_path); if (it != locked_files.end()) @@ -998,7 +998,7 @@ namespace mamba [&] { auto lockedfile = std::make_shared(absolute_file_path, timeout); - auto tracker = std::weak_ptr{lockedfile}; + auto tracker = std::weak_ptr{ lockedfile }; locked_files.insert_or_assign(absolute_file_path, std::move(tracker)); fd_to_locked_path.insert_or_assign(lockedfile->fd(), absolute_file_path); assert(is_lockfile_locked(*lockedfile)); @@ -1011,7 +1011,7 @@ namespace mamba bool is_locked(const fs::u8path& file_path) const { const auto absolute_file_path = fs::absolute(file_path); - std::scoped_lock lock{mutex}; + std::scoped_lock lock{ mutex }; auto it = locked_files.find(file_path); if (it != locked_files.end()) { @@ -1026,7 +1026,7 @@ namespace mamba // note: the resulting value will be obsolete before returning. bool is_locked(int fd) const { - std::scoped_lock lock{mutex}; + std::scoped_lock lock{ mutex }; const auto it = fd_to_locked_path.find(fd); if (it != fd_to_locked_path.end()) { @@ -1040,7 +1040,7 @@ namespace mamba private: - std::atomic_bool m_is_file_locking_allowed{true}; + std::atomic_bool m_is_file_locking_allowed{ true }; // TODO: replace by something like boost::multiindex or equivalent to avoid having to // handle 2 hashmaps @@ -1091,7 +1091,7 @@ namespace mamba LockFile& LockFile::operator=(LockFile&&) = default; LockFile::LockFile(const fs::u8path& path, const std::chrono::seconds& timeout) - : impl{files_locked_by_this_process.acquire_lock(path, timeout)} + : impl{ files_locked_by_this_process.acquire_lock(path, timeout) } { } @@ -1129,9 +1129,8 @@ namespace mamba } // In other cases, something is wrong. - throw mamba_error{ - fmt::format("failed to check if path is locked : '{}'", path.string()), - mamba_error_code::lockfile_failure}; + throw mamba_error{ fmt::format("failed to check if path is locked : '{}'", path.string()), + mamba_error_code::lockfile_failure }; } _lseek(fd, MAMBA_LOCK_POS, SEEK_SET); char buffer[1]; @@ -1469,7 +1468,7 @@ namespace mamba cmd ); - command_args = {comspec.value(), "/D", "/C", script_file->path().string()}; + command_args = { comspec.value(), "/D", "/C", script_file->path().string() }; } else { @@ -1563,7 +1562,7 @@ namespace mamba } else { - options = {scheme + "://" + host, scheme, "all://" + host, "all"}; + options = { scheme + "://" + host, scheme, "all://" + host, "all" }; } for (auto& option : options) diff --git a/libmamba/src/core/util_os.cpp b/libmamba/src/core/util_os.cpp index 5698c3179f..3a32391030 100644 --- a/libmamba/src/core/util_os.cpp +++ b/libmamba/src/core/util_os.cpp @@ -233,7 +233,7 @@ namespace mamba } std::string out, err; - std::vector args = {env::get("COMSPEC").value_or(""), "/c", "ver"}; + std::vector args = { env::get("COMSPEC").value_or(""), "/c", "ver" }; auto [status, ec] = reproc::run( args, reproc::options{}, @@ -289,7 +289,7 @@ namespace mamba // an XML file // that contains the same information. However, then we'd either need an xml // parser or some other crude method to read the data - std::vector args = {"sw_vers", "-productVersion"}; + std::vector args = { "sw_vers", "-productVersion" }; auto [status, ec] = reproc::run( args, reproc::options{}, @@ -323,7 +323,7 @@ namespace mamba } std::string out, err; - std::vector args = {"uname", "-r"}; + std::vector args = { "uname", "-r" }; auto [status, ec] = reproc::run( args, reproc::options{}, @@ -692,7 +692,7 @@ namespace mamba options.redirect.err = silence; } - const std::vector cmd = {"/usr/bin/codesign", "-s", "-", "-f", path.string()}; + const std::vector cmd = { "/usr/bin/codesign", "-s", "-", "-f", path.string() }; auto [status, ec] = reproc::run(cmd, options); if (ec) { diff --git a/libmamba/src/core/util_string.cpp b/libmamba/src/core/util_string.cpp index 23310a0e89..1212de4657 100644 --- a/libmamba/src/core/util_string.cpp +++ b/libmamba/src/core/util_string.cpp @@ -363,9 +363,9 @@ namespace mamba std::size_t const start = input.find_first_not_of(chars); if (start == std::basic_string_view::npos) { - return {input, std::basic_string_view{}}; + return { input, std::basic_string_view{} }; } - return {input.substr(0, start), input.substr(start)}; + return { input.substr(0, start), input.substr(start) }; } } @@ -400,9 +400,9 @@ namespace mamba std::size_t const end = input.find_last_not_of(chars); if (end == std::basic_string_view::npos) { - return {std::basic_string_view{}, input}; + return { std::basic_string_view{}, input }; } - return {input.substr(0, end + 1), input.substr(end + 1)}; + return { input.substr(0, end + 1), input.substr(end + 1) }; } } @@ -437,11 +437,11 @@ namespace mamba std::size_t const start = input.find_first_not_of(chars); if (start == std::basic_string_view::npos) { - return {input, {}, {}}; + return { input, {}, {} }; } std::size_t const end = input.find_last_not_of(chars) + 1; std::size_t const length = end - start; - return {input.substr(0, start), input.substr(start, length), input.substr(end)}; + return { input.substr(0, start), input.substr(start, length), input.substr(end) }; } } @@ -648,7 +648,7 @@ namespace mamba std::string get_common_parts(std::string_view str1, std::string_view str2, std::string_view sep) { - std::string common_str{str1}; + std::string common_str{ str1 }; while ((str2.find(common_str) == std::string::npos)) { if (common_str.find(sep) != std::string::npos) diff --git a/libmamba/src/core/validate.cpp b/libmamba/src/core/validate.cpp index 3ca66020d6..16e94157fd 100644 --- a/libmamba/src/core/validate.cpp +++ b/libmamba/src/core/validate.cpp @@ -293,13 +293,13 @@ namespace mamba::validation { std::array pk, sk; generate_ed25519_keypair(pk.data(), sk.data()); - return {pk, sk}; + return { pk, sk }; } std::pair generate_ed25519_keypair_hex() { auto pair = generate_ed25519_keypair(); - return {::mamba::hex_string(pair.first), ::mamba::hex_string(pair.second)}; + return { ::mamba::hex_string(pair.first), ::mamba::hex_string(pair.second) }; } int sign(const std::string& data, const unsigned char* sk, unsigned char* signature) @@ -509,7 +509,7 @@ namespace mamba::validation RoleKeys RolePubKeys::to_role_keys() const { - return {pubkeys, threshold}; + return { pubkeys, threshold }; } RoleFullKeys::RoleFullKeys(const std::map& keys_, const std::size_t& threshold_) @@ -528,7 +528,7 @@ namespace mamba::validation { keyids.push_back(k.first); } - return {keyids, threshold}; + return { keyids, threshold }; } void check_timestamp_metadata_format(const std::string& ts) @@ -576,11 +576,11 @@ namespace mamba::validation if (spec_version_major == 0) { // Return the most recent possible upgrade first - return {"1", split_spec_version[0] + "." + std::to_string(spec_version_minor + 1)}; + return { "1", split_spec_version[0] + "." + std::to_string(spec_version_minor + 1) }; } else { - return {std::to_string(spec_version_major + 1)}; + return { std::to_string(spec_version_major + 1) }; } } @@ -1058,15 +1058,16 @@ namespace mamba::validation // upgrade first for (auto& s : upgrade_spec) { - files.push_back(mamba::join(".", std::vector({new_v, "sv" + s, "root.json"})) + files.push_back( + mamba::join(".", std::vector({ new_v, "sv" + s, "root.json" })) ); } // compatible next files.push_back( - mamba::join(".", std::vector({new_v, "sv" + compat_spec, "root.json"})) + mamba::join(".", std::vector({ new_v, "sv" + compat_spec, "root.json" })) ); // then finally undefined spec - files.push_back(mamba::join(".", std::vector({new_v, "root.json"}))); + files.push_back(mamba::join(".", std::vector({ new_v, "root.json" }))); return files; } @@ -1178,12 +1179,12 @@ namespace mamba::validation std::set RootImpl::mandatory_defined_roles() const { - return {"root", "snapshot", "targets", "timestamp"}; + return { "root", "snapshot", "targets", "timestamp" }; } std::set RootImpl::optionally_defined_roles() const { - return {"mirrors"}; + return { "mirrors" }; } void @@ -1198,7 +1199,7 @@ namespace mamba::validation { try { - role_keys.insert({keyid, keys.at(keyid)}); + role_keys.insert({ keyid, keys.at(keyid) }); } catch (const std::out_of_range&) { @@ -1207,7 +1208,7 @@ namespace mamba::validation throw role_metadata_error(); } } - m_defined_roles.insert({it.first, {role_keys, it.second.threshold}}); + m_defined_roles.insert({ it.first, { role_keys, it.second.threshold } }); } } @@ -1292,7 +1293,7 @@ namespace mamba::validation pgp_trailer = s.second["other_headers"]; } - unique_sigs.insert(RoleSignature({s.first, s.second.at("signature"), pgp_trailer})); + unique_sigs.insert(RoleSignature({ s.first, s.second.at("signature"), pgp_trailer })); } return unique_sigs; @@ -1374,8 +1375,8 @@ namespace mamba::validation v1_equivalent_root["roles"]["root"] = m_defined_roles.at("root").to_roles(); v1_equivalent_root["roles"]["targets"] = m_defined_roles.at("key_mgr").to_roles(); - v1_equivalent_root["roles"]["snapshot"] = RoleKeys({std::vector(), 1}); - v1_equivalent_root["roles"]["timestamp"] = RoleKeys({std::vector(), 1}); + v1_equivalent_root["roles"]["snapshot"] = RoleKeys({ std::vector(), 1 }); + v1_equivalent_root["roles"]["timestamp"] = RoleKeys({ std::vector(), 1 }); std::map v1_keys = m_defined_roles.at("root").to_keys(); auto key_mgr_keys = m_defined_roles.at("key_mgr").to_keys(); @@ -1397,7 +1398,7 @@ namespace mamba::validation sign(j.dump(), sk, sig_bin.data()); auto sig_hex = ::mamba::hex_string(sig_bin); - return {pk, sig_hex}; + return { pk, sig_hex }; } RoleFullKeys RootImpl::self_keys() const @@ -1407,7 +1408,7 @@ namespace mamba::validation std::set RootImpl::mandatory_defined_roles() const { - return {"root", "key_mgr"}; + return { "root", "key_mgr" }; } std::set RootImpl::optionally_defined_roles() const @@ -1423,9 +1424,9 @@ namespace mamba::validation std::map role_keys; for (auto& key : it.second.pubkeys) { - role_keys.insert({key, Key::from_ed25519(key)}); + role_keys.insert({ key, Key::from_ed25519(key) }); } - m_defined_roles.insert({it.first, {role_keys, it.second.threshold}}); + m_defined_roles.insert({ it.first, { role_keys, it.second.threshold } }); } } @@ -1653,7 +1654,7 @@ namespace mamba::validation std::set KeyMgrRole::mandatory_defined_roles() const { - return {"pkg_mgr"}; + return { "pkg_mgr" }; } std::set KeyMgrRole::optionally_defined_roles() const @@ -1669,9 +1670,9 @@ namespace mamba::validation std::map role_keys; for (auto& key : it.second.pubkeys) { - role_keys.insert({key, Key::from_ed25519(key)}); + role_keys.insert({ key, Key::from_ed25519(key) }); } - m_defined_roles.insert({it.first, {role_keys, it.second.threshold}}); + m_defined_roles.insert({ it.first, { role_keys, it.second.threshold } }); } } @@ -1772,9 +1773,9 @@ namespace mamba::validation std::map role_keys; for (auto& key : it.second.pubkeys) { - role_keys.insert({key, Key::from_ed25519(key)}); + role_keys.insert({ key, Key::from_ed25519(key) }); } - m_defined_roles.insert({it.first, {role_keys, it.second.threshold}}); + m_defined_roles.insert({ it.first, { role_keys, it.second.threshold } }); } } @@ -1842,7 +1843,7 @@ namespace mamba::validation pgp_trailer = s.second["other_headers"]; } - unique_sigs.insert(RoleSignature({s.first, s.second.at("signature"), pgp_trailer})); + unique_sigs.insert(RoleSignature({ s.first, s.second.at("signature"), pgp_trailer })); } return unique_sigs; @@ -1929,27 +1930,27 @@ namespace mamba::validation void to_json(json& j, const Key& key) { - j = json{{"keytype", key.keytype}, {"scheme", key.scheme}, {"keyval", key.keyval}}; + j = json{ { "keytype", key.keytype }, { "scheme", key.scheme }, { "keyval", key.keyval } }; } void to_json(json& j, const RoleKeys& role_keys) { - j = json{{"keyids", role_keys.keyids}, {"threshold", role_keys.threshold}}; + j = json{ { "keyids", role_keys.keyids }, { "threshold", role_keys.threshold } }; } void to_json(json& j, const RolePubKeys& role_keys) { - j = json{{"pubkeys", role_keys.pubkeys}, {"threshold", role_keys.threshold}}; + j = json{ { "pubkeys", role_keys.pubkeys }, { "threshold", role_keys.threshold } }; } void to_json(json& j, const RoleFullKeys& k) { - j = json{{"keys", k.keys}, {"threshold", k.threshold}}; + j = json{ { "keys", k.keys }, { "threshold", k.threshold } }; } void to_json(json& j, const RoleSignature& role_sig) { - j = json{{"keyid", role_sig.keyid}, {"sig", role_sig.sig}}; + j = json{ { "keyid", role_sig.keyid }, { "sig", role_sig.sig } }; if (!role_sig.pgp_trailer.empty()) { j["other_headers"] = role_sig.pgp_trailer; @@ -1958,7 +1959,7 @@ namespace mamba::validation void to_json(json& j, const RoleBase* role) { - j = json{{"version", role->version()}, {"expires", role->expires()}}; + j = json{ { "version", role->version() }, { "expires", role->expires() } }; } void from_json(const json& j, Key& key) diff --git a/libmamba/src/core/virtual_packages.cpp b/libmamba/src/core/virtual_packages.cpp index 4471124dd5..a8817d3dbb 100644 --- a/libmamba/src/core/virtual_packages.cpp +++ b/libmamba/src/core/virtual_packages.cpp @@ -43,7 +43,7 @@ namespace mamba const char* version = ""; #ifdef __linux__ std::vector ver; - const size_t n = confstr(_CS_GNU_LIBC_VERSION, NULL, size_t{0}); + const size_t n = confstr(_CS_GNU_LIBC_VERSION, NULL, size_t{ 0 }); if (n > 0) { @@ -66,7 +66,7 @@ namespace mamba } std::string out, err; - std::vector args = {"nvidia-smi", "--query", "-u", "-x"}; + std::vector args = { "nvidia-smi", "--query", "-u", "-x" }; auto [status, ec] = reproc::run( args, reproc::options{}, @@ -105,7 +105,7 @@ namespace mamba { std::string f = (p.path() / "nvidia-smi.exe").string(); LOG_DEBUG << "Found nvidia-smi in: " << f; - std::vector command = {f, "--query", "-u", "-x"}; + std::vector command = { f, "--query", "-u", "-x" }; auto [_ /*cmd_status*/, cmd_ec] = reproc::run( command, reproc::options{}, diff --git a/libmamba/src/solv-cpp/pool.cpp b/libmamba/src/solv-cpp/pool.cpp index 3e05151c50..8512b6135c 100644 --- a/libmamba/src/solv-cpp/pool.cpp +++ b/libmamba/src/solv-cpp/pool.cpp @@ -107,7 +107,7 @@ namespace mamba::solv flag, /* .create= */ 0 ); - return (id == 0) ? std::nullopt : std::optional(DependencyId{id}); + return (id == 0) ? std::nullopt : std::optional(DependencyId{ id }); } auto ObjPool::add_dependency(StringId name_id, RelationFlag flag, StringId version_id) @@ -193,7 +193,7 @@ namespace mamba::solv // No function exists to create a repo id assert(raw()->repos[raw()->nrepos - 1] == repo_ptr); assert(repo_ptr != nullptr); - return {raw()->nrepos - 1, ObjRepoView{*repo_ptr}}; + return { raw()->nrepos - 1, ObjRepoView{ *repo_ptr } }; } auto ObjPool::has_repo(RepoId id) const -> bool @@ -209,7 +209,7 @@ namespace mamba::solv } auto* repo_ptr = ::pool_id2repo(raw(), id); assert(repo_ptr != nullptr); - return {ObjRepoView{*repo_ptr}}; + return { ObjRepoView{ *repo_ptr } }; } auto ObjPool::get_repo(RepoId id) const -> std::optional @@ -221,7 +221,7 @@ namespace mamba::solv // Safe const_cast because we make the Repo deep const const auto* repo_ptr = ::pool_id2repo(const_cast<::Pool*>(raw()), id); assert(repo_ptr != nullptr); - return {ObjRepoViewConst{*repo_ptr}}; + return { ObjRepoViewConst{ *repo_ptr } }; } auto ObjPool::repo_count() const -> std::size_t @@ -245,7 +245,7 @@ namespace mamba::solv { if (const auto* const installed_ptr = raw()->installed) { - return ObjRepoViewConst{*installed_ptr}; + return ObjRepoViewConst{ *installed_ptr }; } return std::nullopt; } @@ -254,7 +254,7 @@ namespace mamba::solv { if (auto* const installed_ptr = raw()->installed) { - return ObjRepoView{*installed_ptr}; + return ObjRepoView{ *installed_ptr }; } return std::nullopt; } @@ -280,7 +280,7 @@ namespace mamba::solv { if (const ::Solvable* s = ::pool_id2solvable(raw(), id)) { - return ObjSolvableViewConst{*s}; + return ObjSolvableViewConst{ *s }; } } return std::nullopt; @@ -292,7 +292,7 @@ namespace mamba::solv { if (::Solvable* s = ::pool_id2solvable(raw(), id)) { - return ObjSolvableView{*s}; + return ObjSolvableView{ *s }; } } return std::nullopt; diff --git a/libmamba/src/solv-cpp/queue.cpp b/libmamba/src/solv-cpp/queue.cpp index cad1c46c7b..84582ca731 100644 --- a/libmamba/src/solv-cpp/queue.cpp +++ b/libmamba/src/solv-cpp/queue.cpp @@ -212,7 +212,7 @@ namespace mamba::solv auto ObjQueue::rbegin() -> reverse_iterator { - return std::reverse_iterator{end()}; + return std::reverse_iterator{ end() }; } auto ObjQueue::rbegin() const -> const_reverse_iterator @@ -222,12 +222,12 @@ namespace mamba::solv auto ObjQueue::crbegin() const -> const_reverse_iterator { - return std::reverse_iterator{end()}; + return std::reverse_iterator{ end() }; } auto ObjQueue::rend() -> reverse_iterator { - return std::reverse_iterator{begin()}; + return std::reverse_iterator{ begin() }; } auto ObjQueue::rend() const -> const_reverse_iterator @@ -237,7 +237,7 @@ namespace mamba::solv auto ObjQueue::crend() const -> const_reverse_iterator { - return std::reverse_iterator{begin()}; + return std::reverse_iterator{ begin() }; } auto ObjQueue::data() -> pointer diff --git a/libmamba/src/solv-cpp/repo.cpp b/libmamba/src/solv-cpp/repo.cpp index 96de19cebb..b15f8ef723 100644 --- a/libmamba/src/solv-cpp/repo.cpp +++ b/libmamba/src/solv-cpp/repo.cpp @@ -42,7 +42,7 @@ namespace mamba::solv } ObjRepoViewConst::ObjRepoViewConst(const ::Repo& repo) noexcept - : m_repo{&repo} + : m_repo{ &repo } { } @@ -94,7 +94,7 @@ namespace mamba::solv { if (const ::Solvable* s = get_solvable_ptr(raw(), id)) { - return {ObjSolvableViewConst{*s}}; + return { ObjSolvableViewConst{ *s } }; } return std::nullopt; } @@ -133,8 +133,8 @@ namespace mamba::solv }; CFile::CFile(std::FILE* ptr, std::string name) - : m_ptr{ptr} - , m_name{name} + : m_ptr{ ptr } + , m_name{ name } { } @@ -163,7 +163,7 @@ namespace mamba::solv { throw std::system_error(GetLastError(), std::generic_category()); } - return {ptr, path.string()}; + return { ptr, path.string() }; #else std::string name = path.string(); std::FILE* ptr = std::fopen(name.c_str(), mode); @@ -171,7 +171,7 @@ namespace mamba::solv { throw std::system_error(errno, std::generic_category()); } - return {ptr, std::move(name)}; + return { ptr, std::move(name) }; #endif } @@ -211,7 +211,7 @@ namespace mamba::solv ***********************************/ ObjRepoView::ObjRepoView(::Repo& repo) noexcept - : ObjRepoViewConst{repo} + : ObjRepoViewConst{ repo } { } @@ -273,7 +273,7 @@ namespace mamba::solv { if (::Solvable* s = get_solvable_ptr(raw(), id)) { - return {ObjSolvableView{*s}}; + return { ObjSolvableView{ *s } }; } return std::nullopt; } @@ -311,7 +311,7 @@ namespace mamba::solv { return {}; } - return {ptr}; + return { ptr }; } // Can only read key/value on solvable, but the special SOLVID_META is used for a fake diff --git a/libmamba/src/solv-cpp/repo.hpp b/libmamba/src/solv-cpp/repo.hpp index fc77c6ba14..eb0067a402 100644 --- a/libmamba/src/solv-cpp/repo.hpp +++ b/libmamba/src/solv-cpp/repo.hpp @@ -308,7 +308,7 @@ namespace mamba::solv const ::Solvable* s = nullptr; FOR_REPO_SOLVABLES(repo, id, s) { - auto solvable = ObjSolvableViewConst{*s}; + auto solvable = ObjSolvableViewConst{ *s }; if constexpr (std::is_same_v) { if (func(solvable) == LoopControl::Break) @@ -331,7 +331,7 @@ namespace mamba::solv ::Solvable* s = nullptr; FOR_REPO_SOLVABLES(repo, id, s) { - auto solvable = ObjSolvableView{*s}; + auto solvable = ObjSolvableView{ *s }; if constexpr (std::is_same_v) { if (func(solvable) == LoopControl::Break) diff --git a/libmamba/src/solv-cpp/solvable.cpp b/libmamba/src/solv-cpp/solvable.cpp index a239a7f918..774dfacd37 100644 --- a/libmamba/src/solv-cpp/solvable.cpp +++ b/libmamba/src/solv-cpp/solvable.cpp @@ -24,7 +24,7 @@ namespace mamba::solv ********************************************/ ObjSolvableViewConst::ObjSolvableViewConst(const ::Solvable& solvable) noexcept - : m_solvable{&solvable} + : m_solvable{ &solvable } { } @@ -48,7 +48,7 @@ namespace mamba::solv ***************************************/ ObjSolvableView::ObjSolvableView(::Solvable& solvable) noexcept - : ObjSolvableViewConst{solvable} + : ObjSolvableViewConst{ solvable } { } @@ -72,7 +72,7 @@ namespace mamba::solv { return {}; } - return {ptr}; + return { ptr }; } /** diff --git a/libmamba/src/solv-cpp/solver.cpp b/libmamba/src/solv-cpp/solver.cpp index 8b8869230e..bb9e40f022 100644 --- a/libmamba/src/solv-cpp/solver.cpp +++ b/libmamba/src/solv-cpp/solver.cpp @@ -220,9 +220,9 @@ namespace mamba::solv const auto type = ::solver_ruleinfo(const_cast<::Solver*>(raw()), id, &from_id, &to_id, &dep_id); return { - /* .from_id= */ (from_id != 0) ? std::optional{from_id} : std::nullopt, - /* .to_id= */ (to_id != 0) ? std::optional{to_id} : std::nullopt, - /* .dep_id= */ (dep_id != 0) ? std::optional{dep_id} : std::nullopt, + /* .from_id= */ (from_id != 0) ? std::optional{ from_id } : std::nullopt, + /* .to_id= */ (to_id != 0) ? std::optional{ to_id } : std::nullopt, + /* .dep_id= */ (dep_id != 0) ? std::optional{ dep_id } : std::nullopt, /* .type= */ type, /* .klass= */ ::solver_ruleclass(const_cast<::Solver*>(raw()), id), }; diff --git a/libmamba/src/solv-cpp/transaction.cpp b/libmamba/src/solv-cpp/transaction.cpp index 9d86e31a56..d23b3d8e41 100644 --- a/libmamba/src/solv-cpp/transaction.cpp +++ b/libmamba/src/solv-cpp/transaction.cpp @@ -44,11 +44,11 @@ namespace mamba::solv auto ObjTransaction::from_solvables(const ObjPool& pool, const ObjQueue& solvables) -> ObjTransaction { - return ObjTransaction{::transaction_create_decisionq( + return ObjTransaction{ ::transaction_create_decisionq( const_cast<::Pool*>(pool.raw()), const_cast<::Queue*>(solvables.raw()), nullptr - )}; + ) }; } namespace { @@ -61,7 +61,8 @@ namespace mamba::solv auto ObjTransaction::from_solver(const ObjPool& pool, const ObjSolver& solver) -> ObjTransaction { - auto trans = ObjTransaction{::solver_create_transaction(const_cast<::Solver*>(solver.raw()))}; + auto trans = ObjTransaction{ ::solver_create_transaction(const_cast<::Solver*>(solver.raw()) + ) }; assert_same_pool(pool, trans); return trans; } @@ -109,7 +110,7 @@ namespace mamba::solv { if (auto id = ::transaction_obs_pkg(const_cast<::Transaction*>(raw()), step); id != 0) { - return {id}; + return { id }; } } return std::nullopt; diff --git a/libmamba/src/specs/repo_data.cpp b/libmamba/src/specs/repo_data.cpp index 065d5edc78..7ab39ca634 100644 --- a/libmamba/src/specs/repo_data.cpp +++ b/libmamba/src/specs/repo_data.cpp @@ -47,8 +47,8 @@ namespace mamba::specs NLOHMANN_JSON_SERIALIZE_ENUM( NoArchType, { - {NoArchType::Generic, "generic"}, - {NoArchType::Python, "python"}, + { NoArchType::Generic, "generic" }, + { NoArchType::Python, "python" }, } ) diff --git a/libmamba/src/specs/version.cpp b/libmamba/src/specs/version.cpp index 4ff4fb2a2c..1475a68273 100644 --- a/libmamba/src/specs/version.cpp +++ b/libmamba/src/specs/version.cpp @@ -55,20 +55,20 @@ namespace mamba::specs ***************************************/ VersionPartAtom::VersionPartAtom(std::size_t numeral) noexcept - : m_numeral{numeral} + : m_numeral{ numeral } { } VersionPartAtom::VersionPartAtom(std::size_t numeral, std::string_view literal) - : m_literal{to_lower(literal)} - , m_numeral{numeral} + : m_literal{ to_lower(literal) } + , m_numeral{ numeral } { } template VersionPartAtom::VersionPartAtom(std::size_t numeral, std::basic_string&& literal) - : m_literal{to_lower(std::move(literal))} - , m_numeral{numeral} + : m_literal{ to_lower(std::move(literal)) } + , m_numeral{ numeral } { } @@ -146,7 +146,7 @@ namespace mamba::specs { // More efficient thatn three way comparison because of edge cases auto attrs = [](const VersionPartAtom& a) -> std::tuple { - return {a.numeral(), a.literal()}; + return { a.numeral(), a.literal() }; }; return attrs(*this) == attrs(other); } @@ -182,9 +182,9 @@ namespace mamba::specs *******************************/ Version::Version(std::size_t epoch, CommonVersion&& version, CommonVersion&& local) noexcept - : m_version{std::move(version)} - , m_local{std::move(local)} - , m_epoch{epoch} + : m_version{ std::move(version) } + , m_local{ std::move(local) } + , m_epoch{ epoch } { } @@ -344,7 +344,7 @@ namespace mamba::specs auto make_string_view(Iter first, Iter last) -> std::string_view { const auto size = util::safe_num_cast(last - first); - return {first, size}; + return { first, size }; } template @@ -367,7 +367,7 @@ namespace mamba::specs // No epoch is specified if (delim_pos == std::string_view::npos) // TODO(C++20) [[likely]] { - return {Int(0), str}; + return { Int(0), str }; } if (delim_pos == 0) { @@ -386,7 +386,7 @@ namespace mamba::specs ); } // Found an epoch - return {maybe_int.value(), str.substr(delim_pos + 1)}; + return { maybe_int.value(), str.substr(delim_pos + 1) }; } template @@ -395,14 +395,14 @@ namespace mamba::specs const auto [integer_str, rest] = lstrip_if_parts(str, [](char c) { return is_digit(c); }); auto maybe_integer = to_int(integer_str); assert(maybe_integer.has_value()); - return {maybe_integer.value(), rest}; + return { maybe_integer.value(), rest }; } auto parse_leading_literal(std::string_view str) -> std::pair { const auto [literal, rest] = lstrip_if_parts(str, [](char c) { return !is_digit(c); }); - return {literal, rest}; + return { literal, rest }; } auto parse_leading_part_atom(std::string_view str) @@ -422,7 +422,7 @@ namespace mamba::specs tail = str; } std::tie(literal, tail) = parse_leading_literal(tail); - return {{numeral, literal}, tail}; + return { { numeral, literal }, tail }; } auto parse_part(std::string_view str) -> VersionPart @@ -480,7 +480,7 @@ namespace mamba::specs Version::part_delim_alt, Version::part_delim_special, }; - static constexpr auto delims = std::string_view{delims_buf.data(), delims_buf.size()}; + static constexpr auto delims = std::string_view{ delims_buf.data(), delims_buf.size() }; CommonVersion parts = {}; auto tail = str; @@ -518,7 +518,7 @@ namespace mamba::specs // No local is specified if (delim_pos == std::string_view::npos) // TODO(C++20) [[likely]] { - return {str, {}}; + return { str, {} }; } // local specified but empty if (delim_pos + 1 == str.size()) @@ -527,7 +527,7 @@ namespace mamba::specs fmt::format("Empty local version delimited by '{}'.", Version::local_delim) ); } - return {str.substr(0, delim_pos), parse_common_version(str.substr(delim_pos + 1))}; + return { str.substr(0, delim_pos), parse_common_version(str.substr(delim_pos + 1)) }; } auto parse_version(std::string_view str) -> CommonVersion diff --git a/libmamba/src/version.cpp b/libmamba/src/version.cpp index c70f50f1b9..0693e9e352 100644 --- a/libmamba/src/version.cpp +++ b/libmamba/src/version.cpp @@ -16,6 +16,6 @@ namespace mamba std::array version_arr() { - return {LIBMAMBA_VERSION_MAJOR, LIBMAMBA_VERSION_MINOR, LIBMAMBA_VERSION_PATCH}; + return { LIBMAMBA_VERSION_MAJOR, LIBMAMBA_VERSION_MINOR, LIBMAMBA_VERSION_PATCH }; } } diff --git a/libmamba/tests/src/core/test_channel.cpp b/libmamba/tests/src/core/test_channel.cpp index bf847443c5..82cc49163e 100644 --- a/libmamba/tests/src/core/test_channel.cpp +++ b/libmamba/tests/src/core/test_channel.cpp @@ -86,7 +86,7 @@ namespace mamba CHECK_EQ(c.name(), "conda-forge"); CHECK_EQ(c.canonical_name(), "conda-forge"); // CHECK_EQ(c.url(), "conda-forge"); - CHECK_EQ(c.platforms(), std::vector({platform, "noarch"})); + CHECK_EQ(c.platforms(), std::vector({ platform, "noarch" })); ctx.channel_alias = "https://conda.anaconda.org"; } @@ -97,13 +97,13 @@ namespace mamba auto& ctx = Context::instance(); auto old_default_channels = ctx.default_channels; ctx.channel_alias = "https://ali.as/"; - ctx.default_channels = {"prefix"}; - ctx.channels = {"prefix-and-more"}; + ctx.default_channels = { "prefix" }; + ctx.channels = { "prefix-and-more" }; ChannelContext channel_context; auto base = std::string("https://ali.as/prefix-and-more/"); auto& chan = channel_context.make_channel(base); - std::vector expected_urls = {base + platform, base + "noarch"}; + std::vector expected_urls = { base + platform, base + "noarch" }; CHECK_EQ(chan.urls(), expected_urls); ctx.channel_alias = "https://conda.anaconda.org"; @@ -118,8 +118,8 @@ namespace mamba auto& ctx = Context::instance(); ctx.channel_alias = "https://mydomain.com/channels/"; ctx.custom_channels = { - {"test_channel", "file:///tmp"}, - {"some_channel", "https://conda.mydomain.xyz/"}, + { "test_channel", "file:///tmp" }, + { "some_channel", "https://conda.mydomain.xyz/" }, }; ChannelContext channel_context; @@ -136,11 +136,9 @@ namespace mamba CHECK_EQ(c.location(), "/tmp"); CHECK_EQ(c.name(), "test_channel"); CHECK_EQ(c.canonical_name(), "test_channel"); - CHECK_EQ(c.platforms(), std::vector({platform, "noarch"})); - std::vector exp_urls( - {std::string("file:///tmp/test_channel/") + platform, - std::string("file:///tmp/test_channel/noarch")} - ); + CHECK_EQ(c.platforms(), std::vector({ platform, "noarch" })); + std::vector exp_urls({ std::string("file:///tmp/test_channel/") + platform, + std::string("file:///tmp/test_channel/noarch") }); CHECK_EQ(c.urls(), exp_urls); } @@ -151,10 +149,10 @@ namespace mamba CHECK_EQ(c.location(), "conda.mydomain.xyz"); CHECK_EQ(c.name(), "some_channel"); CHECK_EQ(c.canonical_name(), "some_channel"); - CHECK_EQ(c.platforms(), std::vector({platform, "noarch"})); + CHECK_EQ(c.platforms(), std::vector({ platform, "noarch" })); std::vector exp_urls( - {std::string("https://conda.mydomain.xyz/some_channel/") + platform, - std::string("https://conda.mydomain.xyz/some_channel/noarch")} + { std::string("https://conda.mydomain.xyz/some_channel/") + platform, + std::string("https://conda.mydomain.xyz/some_channel/noarch") } ); CHECK_EQ(c.urls(), exp_urls); } @@ -171,32 +169,34 @@ namespace mamba ctx.custom_multichannels["xtest"] = std::vector{ "https://mydomain.com/conda-forge", "https://mydomain.com/bioconda", - "https://mydomain.com/snakepit"}; + "https://mydomain.com/snakepit" + }; ctx.custom_multichannels["ytest"] = std::vector{ "https://otherdomain.com/conda-forge", "https://otherdomain.com/bioconda", - "https://otherdomain.com/snakepit"}; + "https://otherdomain.com/snakepit" + }; ChannelContext channel_context; - auto x = channel_context.get_channels({"xtest"}); + auto x = channel_context.get_channels({ "xtest" }); CHECK_EQ(x.size(), 3); auto* c1 = x[0]; std::vector exp_urls( - {std::string("https://mydomain.com/conda-forge/") + platform, - std::string("https://mydomain.com/conda-forge/noarch")} + { std::string("https://mydomain.com/conda-forge/") + platform, + std::string("https://mydomain.com/conda-forge/noarch") } ); CHECK_EQ(c1->urls(), exp_urls); std::vector exp_urlsy3( - {std::string("https://otherdomain.com/snakepit/") + platform, - std::string("https://otherdomain.com/snakepit/noarch")} + { std::string("https://otherdomain.com/snakepit/") + platform, + std::string("https://otherdomain.com/snakepit/noarch") } ); - auto y = channel_context.get_channels({"ytest"}); + auto y = channel_context.get_channels({ "ytest" }); auto* y3 = y[2]; CHECK_EQ(y3->urls(), exp_urlsy3); @@ -218,11 +218,12 @@ namespace mamba ctx.custom_multichannels["everything"] = std::vector{ "conda-forge", "https://mydomain.com/bioconda", - "xyz"}; + "xyz" + }; ChannelContext channel_context; - auto x = channel_context.get_channels({"everything"}); + auto x = channel_context.get_channels({ "everything" }); CHECK_EQ(x.size(), 3); auto* c1 = x[0]; @@ -230,22 +231,22 @@ namespace mamba auto* c3 = x[2]; std::vector exp_urls( - {std::string("https://condaforge.org/channels/conda-forge/") + platform, - std::string("https://condaforge.org/channels/conda-forge/noarch")} + { std::string("https://condaforge.org/channels/conda-forge/") + platform, + std::string("https://condaforge.org/channels/conda-forge/noarch") } ); CHECK_EQ(c1->urls(), exp_urls); std::vector exp_urls2( - {std::string("https://mydomain.com/bioconda/") + platform, - std::string("https://mydomain.com/bioconda/noarch")} + { std::string("https://mydomain.com/bioconda/") + platform, + std::string("https://mydomain.com/bioconda/noarch") } ); CHECK_EQ(c2->urls(), exp_urls2); std::vector exp_urls3( - {std::string("https://mydomain.xyz/xyzchannel/xyz/") + platform, - std::string("https://mydomain.xyz/xyzchannel/xyz/noarch")} + { std::string("https://mydomain.xyz/xyzchannel/xyz/") + platform, + std::string("https://mydomain.xyz/xyzchannel/xyz/noarch") } ); CHECK_EQ(c3->urls(), exp_urls3); @@ -260,22 +261,22 @@ namespace mamba auto& ctx = Context::instance(); ChannelContext channel_context; - auto x = channel_context.get_channels({"defaults"}); + auto x = channel_context.get_channels({ "defaults" }); #if !defined(_WIN32) const Channel* c1 = x[0]; const Channel* c2 = x[1]; CHECK_EQ(c1->name(), "pkgs/main"); std::vector exp_urls( - {std::string("https://repo.anaconda.com/pkgs/main/") + platform, - std::string("https://repo.anaconda.com/pkgs/main/noarch")} + { std::string("https://repo.anaconda.com/pkgs/main/") + platform, + std::string("https://repo.anaconda.com/pkgs/main/noarch") } ); CHECK_EQ(c1->urls(), exp_urls); CHECK_EQ(c2->name(), "pkgs/r"); std::vector exp_urls2( - {std::string("https://repo.anaconda.com/pkgs/r/") + platform, - std::string("https://repo.anaconda.com/pkgs/r/noarch")} + { std::string("https://repo.anaconda.com/pkgs/r/") + platform, + std::string("https://repo.anaconda.com/pkgs/r/noarch") } ); CHECK_EQ(c2->urls(), exp_urls2); @@ -289,24 +290,23 @@ namespace mamba TEST_CASE("custom_default_channels") { auto& ctx = Context::instance(); - ctx.default_channels = { - "https://mamba.com/test/channel", - "https://mamba.com/stable/channel"}; + ctx.default_channels = { "https://mamba.com/test/channel", + "https://mamba.com/stable/channel" }; ChannelContext channel_context; - auto x = channel_context.get_channels({"defaults"}); + auto x = channel_context.get_channels({ "defaults" }); const Channel* c1 = x[0]; const Channel* c2 = x[1]; CHECK_EQ(c1->name(), "test/channel"); std::vector exp_urls( - {std::string("https://mamba.com/test/channel/") + platform, - std::string("https://mamba.com/test/channel/noarch")} + { std::string("https://mamba.com/test/channel/") + platform, + std::string("https://mamba.com/test/channel/noarch") } ); CHECK_EQ(c1->urls(), exp_urls); std::vector exp_urls2( - {std::string("https://mamba.com/stable/channel/") + platform, - std::string("https://mamba.com/stable/channel/noarch")} + { std::string("https://mamba.com/stable/channel/") + platform, + std::string("https://mamba.com/stable/channel/noarch") } ); CHECK_EQ(c2->urls(), exp_urls2); @@ -321,8 +321,8 @@ namespace mamba { auto& ctx = Context::instance(); ctx.custom_channels = { - {"test_channel", "https://server.com/private/channels"}, - {"random/test_channel", "https://server.com/random/channels"}, + { "test_channel", "https://server.com/private/channels" }, + { "random/test_channel", "https://server.com/random/channels" }, }; ChannelContext channel_context; @@ -333,10 +333,10 @@ namespace mamba CHECK_EQ(c.location(), "server.com/private/channels"); CHECK_EQ(c.name(), "test_channel"); CHECK_EQ(c.canonical_name(), "test_channel"); - CHECK_EQ(c.platforms(), std::vector({platform, "noarch"})); + CHECK_EQ(c.platforms(), std::vector({ platform, "noarch" })); std::vector exp_urls( - {std::string("https://server.com/private/channels/test_channel/") + platform, - std::string("https://server.com/private/channels/test_channel/noarch")} + { std::string("https://server.com/private/channels/test_channel/") + platform, + std::string("https://server.com/private/channels/test_channel/noarch") } ); CHECK_EQ(c.urls(), exp_urls); } @@ -348,11 +348,12 @@ namespace mamba CHECK_EQ(c.location(), "server.com/private/channels"); CHECK_EQ(c.name(), "test_channel/mylabel/xyz"); CHECK_EQ(c.canonical_name(), "test_channel/mylabel/xyz"); - CHECK_EQ(c.platforms(), std::vector({platform, "noarch"})); + CHECK_EQ(c.platforms(), std::vector({ platform, "noarch" })); std::vector exp_urls( - {std::string("https://server.com/private/channels/test_channel/mylabel/xyz/") - + platform, - std::string("https://server.com/private/channels/test_channel/mylabel/xyz/noarch")} + { std::string("https://server.com/private/channels/test_channel/mylabel/xyz/") + + platform, + std::string("https://server.com/private/channels/test_channel/mylabel/xyz/noarch" + ) } ); CHECK_EQ(c.urls(), exp_urls); } @@ -364,11 +365,11 @@ namespace mamba CHECK_EQ(c.location(), "server.com/random/channels"); CHECK_EQ(c.name(), "random/test_channel/pkg"); CHECK_EQ(c.canonical_name(), "random/test_channel/pkg"); - CHECK_EQ(c.platforms(), std::vector({platform, "noarch"})); + CHECK_EQ(c.platforms(), std::vector({ platform, "noarch" })); std::vector exp_urls( - {std::string("https://server.com/random/channels/random/test_channel/pkg/") - + platform, - std::string("https://server.com/random/channels/random/test_channel/pkg/noarch")} + { std::string("https://server.com/random/channels/random/test_channel/pkg/") + + platform, + std::string("https://server.com/random/channels/random/test_channel/pkg/noarch") } ); CHECK_EQ(c.urls(), exp_urls); } @@ -389,7 +390,7 @@ namespace mamba CHECK_EQ(c.location(), "repo.mamba.pm"); CHECK_EQ(c.name(), "conda-forge"); CHECK_EQ(c.canonical_name(), "https://repo.mamba.pm/conda-forge"); - CHECK_EQ(c.platforms(), std::vector({platform, "noarch"})); + CHECK_EQ(c.platforms(), std::vector({ platform, "noarch" })); } TEST_CASE("make_channel") @@ -401,7 +402,7 @@ namespace mamba CHECK_EQ(c.location(), "conda.anaconda.org"); CHECK_EQ(c.name(), "conda-forge"); CHECK_EQ(c.canonical_name(), "conda-forge"); - CHECK_EQ(c.platforms(), std::vector({platform, "noarch"})); + CHECK_EQ(c.platforms(), std::vector({ platform, "noarch" })); std::string value2 = "https://repo.anaconda.com/pkgs/main[" + platform + "]"; const Channel& c2 = channel_context.make_channel(value2); @@ -409,7 +410,7 @@ namespace mamba CHECK_EQ(c2.location(), "repo.anaconda.com"); CHECK_EQ(c2.name(), "pkgs/main"); CHECK_EQ(c2.canonical_name(), "https://repo.anaconda.com/pkgs/main"); - CHECK_EQ(c2.platforms(), std::vector({platform})); + CHECK_EQ(c2.platforms(), std::vector({ platform })); std::string value3 = "https://conda.anaconda.org/conda-forge[" + platform + "]"; const Channel& c3 = channel_context.make_channel(value3); @@ -417,7 +418,7 @@ namespace mamba CHECK_EQ(c3.location(), c.location()); CHECK_EQ(c3.name(), c.name()); CHECK_EQ(c3.canonical_name(), c.canonical_name()); - CHECK_EQ(c3.platforms(), std::vector({platform})); + CHECK_EQ(c3.platforms(), std::vector({ platform })); std::string value4 = "/home/mamba/test/channel_b"; const Channel& c4 = channel_context.make_channel(value4); @@ -431,7 +432,7 @@ namespace mamba CHECK_EQ(c4.canonical_name(), "file:///home/mamba/test/channel_b"); #endif CHECK_EQ(c4.name(), "channel_b"); - CHECK_EQ(c4.platforms(), std::vector({platform, "noarch"})); + CHECK_EQ(c4.platforms(), std::vector({ platform, "noarch" })); std::string value5 = "/home/mamba/test/channel_b[" + platform + "]"; const Channel& c5 = channel_context.make_channel(value5); @@ -444,25 +445,25 @@ namespace mamba CHECK_EQ(c5.canonical_name(), "file:///home/mamba/test/channel_b"); #endif CHECK_EQ(c5.name(), "channel_b"); - CHECK_EQ(c5.platforms(), std::vector({platform})); + CHECK_EQ(c5.platforms(), std::vector({ platform })); std::string value6a = "http://localhost:8000/conda-forge[noarch]"; const Channel& c6a = channel_context.make_channel(value6a); CHECK_EQ( c6a.urls(false), - std::vector({"http://localhost:8000/conda-forge/noarch"}) + std::vector({ "http://localhost:8000/conda-forge/noarch" }) ); std::string value6b = "http://localhost:8000/conda_mirror/conda-forge[noarch]"; const Channel& c6b = channel_context.make_channel(value6b); CHECK_EQ( c6b.urls(false), - std::vector({"http://localhost:8000/conda_mirror/conda-forge/noarch"}) + std::vector({ "http://localhost:8000/conda_mirror/conda-forge/noarch" }) ); std::string value7 = "conda-forge[noarch,arbitrary]"; const Channel& c7 = channel_context.make_channel(value7); - CHECK_EQ(c7.platforms(), std::vector({"noarch", "arbitrary"})); + CHECK_EQ(c7.platforms(), std::vector({ "noarch", "arbitrary" })); } TEST_CASE("urls") @@ -472,20 +473,16 @@ namespace mamba const Channel& c = channel_context.make_channel(value); CHECK_EQ( c.urls(), - std::vector( - {"https://conda.anaconda.org/conda-forge/noarch", - "https://conda.anaconda.org/conda-forge/win-64", - "https://conda.anaconda.org/conda-forge/arbitrary"} - ) + std::vector({ "https://conda.anaconda.org/conda-forge/noarch", + "https://conda.anaconda.org/conda-forge/win-64", + "https://conda.anaconda.org/conda-forge/arbitrary" }) ); const Channel& c1 = channel_context.make_channel("https://conda.anaconda.org/conda-forge"); CHECK_EQ( c1.urls(), - std::vector( - {"https://conda.anaconda.org/conda-forge/" + platform, - "https://conda.anaconda.org/conda-forge/noarch"} - ) + std::vector({ "https://conda.anaconda.org/conda-forge/" + platform, + "https://conda.anaconda.org/conda-forge/noarch" }) ); } @@ -494,7 +491,8 @@ namespace mamba auto& ctx = Context::instance(); ctx.authentication_info()["conda.anaconda.org"] = AuthenticationInfo{ AuthenticationType::kCondaToken, - "my-12345-token"}; + "my-12345-token" + }; ChannelContext channel_context; @@ -503,11 +501,11 @@ namespace mamba CHECK_EQ( chan.urls(true), std::vector{ - {"https://conda.anaconda.org/t/my-12345-token/conda-forge/noarch"}} + { "https://conda.anaconda.org/t/my-12345-token/conda-forge/noarch" } } ); CHECK_EQ( chan.urls(false), - std::vector{{"https://conda.anaconda.org/conda-forge/noarch"}} + std::vector{ { "https://conda.anaconda.org/conda-forge/noarch" } } ); } @@ -516,10 +514,12 @@ namespace mamba auto& ctx = Context::instance(); ctx.authentication_info()["conda.anaconda.org"] = AuthenticationInfo{ AuthenticationType::kCondaToken, - "base-token"}; + "base-token" + }; ctx.authentication_info()["conda.anaconda.org/conda-forge"] = AuthenticationInfo{ AuthenticationType::kCondaToken, - "channel-token"}; + "channel-token" + }; ChannelContext channel_context; @@ -535,9 +535,8 @@ namespace mamba const Channel& c = channel_context.make_channel("C:\\test\\channel"); CHECK_EQ( c.urls(false), - std::vector( - {"file:///C:/test/channel/win-64", "file:///C:/test/channel/noarch"} - ) + std::vector({ "file:///C:/test/channel/win-64", + "file:///C:/test/channel/noarch" }) ); } else @@ -545,9 +544,8 @@ namespace mamba const Channel& c = channel_context.make_channel("/test/channel"); CHECK_EQ( c.urls(false), - std::vector( - {std::string("file:///test/channel/") + platform, "file:///test/channel/noarch"} - ) + std::vector({ std::string("file:///test/channel/") + platform, + "file:///test/channel/noarch" }) ); } } @@ -558,9 +556,8 @@ namespace mamba const Channel& c = channel_context.make_channel("http://localhost:8000/"); CHECK_EQ(c.platform_url("win-64", false), "http://localhost:8000/win-64"); CHECK_EQ(c.base_url(), "http://localhost:8000"); - std::vector expected_urls( - {std::string("http://localhost:8000/") + platform, "http://localhost:8000/noarch"} - ); + std::vector expected_urls({ std::string("http://localhost:8000/") + platform, + "http://localhost:8000/noarch" }); CHECK_EQ(c.urls(true), expected_urls); const Channel& c4 = channel_context.make_channel("http://localhost:8000"); CHECK_EQ(c4.platform_url("linux-64", false), "http://localhost:8000/linux-64"); @@ -577,9 +574,9 @@ namespace mamba ); std::vector expected_urls2( - {std::string("https://localhost:8000/t/xy-12345678-1234-1234-1234-123456789012/") - + platform, - "https://localhost:8000/t/xy-12345678-1234-1234-1234-123456789012/noarch"} + { std::string("https://localhost:8000/t/xy-12345678-1234-1234-1234-123456789012/") + + platform, + "https://localhost:8000/t/xy-12345678-1234-1234-1234-123456789012/noarch" } ); CHECK_EQ(c3.urls(true), expected_urls2); diff --git a/libmamba/tests/src/core/test_configuration.cpp b/libmamba/tests/src/core/test_configuration.cpp index abfcb1afa6..438a0feacb 100644 --- a/libmamba/tests/src/core/test_configuration.cpp +++ b/libmamba/tests/src/core/test_configuration.cpp @@ -60,7 +60,7 @@ namespace mamba out_file.close(); config.reset_configurables(); - config.at("rc_files").set_value>({unique_location}); + config.at("rc_files").set_value>({ unique_location }); config.load(); } @@ -169,7 +169,7 @@ namespace mamba - test2 - test1)"); - std::vector rcs = {rc1, rc2}; + std::vector rcs = { rc1, rc2 }; load_test_config(rcs); REQUIRE_EQ(config.sources().size(), 2); @@ -286,7 +286,7 @@ namespace mamba - test10 override_channels_enabled: false)"); - load_test_config({rc1, rc2}); + load_test_config({ rc1, rc2 }); REQUIRE_EQ(config.sources().size(), 2); REQUIRE_EQ(config.valid_sources().size(), 2); @@ -337,7 +337,7 @@ namespace mamba - c11 - c32 - c21)"); - load_test_config({rc1, rc2, rc3}); + load_test_config({ rc1, rc2, rc3 }); CHECK_EQ(config.dump(), unindent(R"( channels: @@ -408,7 +408,7 @@ namespace mamba - c11 - c32 - c21)"); - load_test_config({rc1, rc2, rc3}); + load_test_config({ rc1, rc2, rc3 }); CHECK_EQ(config.dump(), unindent(R"( default_channels: @@ -474,10 +474,10 @@ namespace mamba std::string rc1 = "channel_alias: http://repo.mamba.pm/"; std::string rc2 = "channel_alias: https://conda.anaconda.org/"; - load_test_config({rc1, rc2}); + load_test_config({ rc1, rc2 }); CHECK_EQ(config.dump(), "channel_alias: http://repo.mamba.pm/"); - load_test_config({rc2, rc1}); + load_test_config({ rc2, rc1 }); CHECK_EQ(config.dump(), "channel_alias: https://conda.anaconda.org/"); env::set("MAMBA_CHANNEL_ALIAS", "https://foo.bar"); @@ -512,10 +512,10 @@ namespace mamba std::string rc1 = "pkgs_dirs:\n - " + cache1; std::string rc2 = "pkgs_dirs:\n - " + cache2; - load_test_config({rc1, rc2}); + load_test_config({ rc1, rc2 }); CHECK_EQ(config.dump(), "pkgs_dirs:\n - " + cache1 + "\n - " + cache2); - load_test_config({rc2, rc1}); + load_test_config({ rc2, rc1 }); CHECK_EQ(config.dump(), "pkgs_dirs:\n - " + cache2 + "\n - " + cache1); std::string cache3 = (env::home_directory() / "baz").string(); @@ -557,7 +557,7 @@ namespace mamba CHECK_EQ( config.dump( MAMBA_SHOW_CONFIG_VALUES | MAMBA_SHOW_CONFIG_SRCS | MAMBA_SHOW_ALL_CONFIGS, - {"pkgs_dirs"} + { "pkgs_dirs" } ), unindent((R"( pkgs_dirs: @@ -629,11 +629,11 @@ namespace mamba std::string rc1 = "ssl_verify: true"; std::string rc2 = "ssl_verify: false"; - load_test_config({rc1, rc2}); + load_test_config({ rc1, rc2 }); CHECK_EQ(config.at("ssl_verify").value(), ""); CHECK_EQ(ctx.remote_fetch_params.ssl_verify, ""); - load_test_config({rc2, rc1}); + load_test_config({ rc2, rc1 }); CHECK_EQ(config.at("ssl_verify").value(), ""); CHECK_EQ(ctx.remote_fetch_params.ssl_verify, ""); @@ -721,7 +721,8 @@ namespace mamba https: bar)"); load_test_config(rc); auto& actual = config.at("proxy_servers").value>(); - std::map expected = {{"http", "foo"}, {"https", "bar"}}; + std::map expected = { { "http", "foo" }, + { "https", "bar" } }; CHECK_EQ(actual, expected); CHECK_EQ(ctx.proxy_servers, expected); @@ -771,11 +772,11 @@ namespace mamba std::string rc2 = std::string(#NAME) + ": false"; \ if (config.at(#NAME).rc_configurable()) \ { \ - load_test_config({rc1, rc2}); \ + load_test_config({ rc1, rc2 }); \ CHECK(config.at(#NAME).value()); \ CHECK(CTX); \ \ - load_test_config({rc2, rc1}); \ + load_test_config({ rc2, rc1 }); \ CHECK_FALSE(config.at(#NAME).value()); \ CHECK_FALSE(CTX); \ } \ @@ -798,7 +799,7 @@ namespace mamba expected = std::string(#NAME) + ": true # '" + env_name + "'"; \ } \ int dump_opts = MAMBA_SHOW_CONFIG_VALUES | MAMBA_SHOW_CONFIG_SRCS; \ - CHECK_EQ((config.dump(dump_opts, {#NAME})), expected); \ + CHECK_EQ((config.dump(dump_opts, { #NAME })), expected); \ CHECK(config.at(#NAME).value()); \ CHECK(CTX); \ \ @@ -811,7 +812,7 @@ namespace mamba expected = std::string(#NAME) + ": true # 'API' > '" + env_name + "'"; \ } \ config.at(#NAME).set_yaml_value("true").compute(); \ - CHECK_EQ((config.dump(dump_opts, {#NAME})), expected); \ + CHECK_EQ((config.dump(dump_opts, { #NAME })), expected); \ CHECK(config.at(#NAME).value()); \ CHECK(CTX); \ \ @@ -834,21 +835,21 @@ namespace mamba std::string rc2 = "channel_priority: strict"; std::string rc3 = "channel_priority: disabled"; - load_test_config({rc1, rc2, rc3}); + load_test_config({ rc1, rc2, rc3 }); CHECK_EQ( config.at("channel_priority").value(), ChannelPriority::kFlexible ); CHECK(ctx.channel_priority == ChannelPriority::kFlexible); - load_test_config({rc3, rc1, rc2}); + load_test_config({ rc3, rc1, rc2 }); CHECK_EQ( config.at("channel_priority").value(), ChannelPriority::kDisabled ); CHECK(ctx.channel_priority == ChannelPriority::kDisabled); - load_test_config({rc2, rc1, rc3}); + load_test_config({ rc2, rc1, rc3 }); CHECK_EQ( config.at("channel_priority").value(), ChannelPriority::kStrict @@ -905,7 +906,7 @@ namespace mamba - bokeh - matplotlib)"); - load_test_config({rc1, rc2, rc3}); + load_test_config({ rc1, rc2, rc3 }); CHECK_EQ(config.dump(), unindent(R"( pinned_packages: - jupyterlab=3 @@ -914,10 +915,10 @@ namespace mamba - bokeh)")); CHECK_EQ( ctx.pinned_packages, - std::vector({"jupyterlab=3", "numpy=1.19", "matplotlib", "bokeh"}) + std::vector({ "jupyterlab=3", "numpy=1.19", "matplotlib", "bokeh" }) ); - load_test_config({rc2, rc1, rc3}); + load_test_config({ rc2, rc1, rc3 }); REQUIRE(config.at("pinned_packages").yaml_value()); CHECK_EQ(config.dump(), unindent(R"( pinned_packages: @@ -927,7 +928,7 @@ namespace mamba - bokeh)")); CHECK_EQ( ctx.pinned_packages, - std::vector({"matplotlib", "numpy=1.19", "jupyterlab=3", "bokeh"}) + std::vector({ "matplotlib", "numpy=1.19", "jupyterlab=3", "bokeh" }) ); env::set("MAMBA_PINNED_PACKAGES", "mpl=10.2,xtensor"); @@ -950,7 +951,7 @@ namespace mamba ); CHECK_EQ( ctx.pinned_packages, - std::vector({"mpl=10.2", "xtensor", "jupyterlab=3", "numpy=1.19"}) + std::vector({ "mpl=10.2", "xtensor", "jupyterlab=3", "numpy=1.19" }) ); config.at("pinned_packages").set_yaml_value("pytest").compute(); @@ -970,7 +971,7 @@ namespace mamba CHECK_EQ( ctx.pinned_packages, std::vector( - {"pytest", "mpl=10.2", "xtensor", "jupyterlab=3", "numpy=1.19"} + { "pytest", "mpl=10.2", "xtensor", "jupyterlab=3", "numpy=1.19" } ) ); @@ -1007,18 +1008,18 @@ namespace mamba std::string rc2 = "safety_checks: warn"; std::string rc3 = "safety_checks: disabled"; - load_test_config({rc1, rc2, rc3}); + load_test_config({ rc1, rc2, rc3 }); CHECK_EQ( config.at("safety_checks").value(), VerificationLevel::kEnabled ); CHECK_EQ(ctx.safety_checks, VerificationLevel::kEnabled); - load_test_config({rc2, rc1, rc3}); + load_test_config({ rc2, rc1, rc3 }); CHECK_EQ(config.at("safety_checks").value(), VerificationLevel::kWarn); CHECK_EQ(ctx.safety_checks, VerificationLevel::kWarn); - load_test_config({rc3, rc1, rc3}); + load_test_config({ rc3, rc1, rc3 }); CHECK_EQ( config.at("safety_checks").value(), VerificationLevel::kDisabled diff --git a/libmamba/tests/src/core/test_cpp.cpp b/libmamba/tests/src/core/test_cpp.cpp index d4dbff3159..7e291f0d1a 100644 --- a/libmamba/tests/src/core/test_cpp.cpp +++ b/libmamba/tests/src/core/test_cpp.cpp @@ -309,25 +309,18 @@ namespace mamba { using param_type = std::tuple; std::vector param_values = { - std::make_tuple("y", 'y', true), - std::make_tuple("yes", 'y', true), - std::make_tuple("Y", 'y', true), - std::make_tuple("Yes", 'y', true), - std::make_tuple("", 'y', true), - std::make_tuple("n", 'y', false), - std::make_tuple("no", 'y', false), - std::make_tuple("N", 'y', false), + std::make_tuple("y", 'y', true), std::make_tuple("yes", 'y', true), + std::make_tuple("Y", 'y', true), std::make_tuple("Yes", 'y', true), + std::make_tuple("", 'y', true), std::make_tuple("n", 'y', false), + std::make_tuple("no", 'y', false), std::make_tuple("N", 'y', false), std::make_tuple("No", 'y', false), - std::make_tuple("y", 'n', true), - std::make_tuple("yes", 'n', true), - std::make_tuple("Y", 'n', true), - std::make_tuple("Yes", 'n', true), - std::make_tuple("", 'n', false), - std::make_tuple("n", 'n', false), - std::make_tuple("no", 'n', false), - std::make_tuple("N", 'n', false), - std::make_tuple("No", 'n', false)}; + std::make_tuple("y", 'n', true), std::make_tuple("yes", 'n', true), + std::make_tuple("Y", 'n', true), std::make_tuple("Yes", 'n', true), + std::make_tuple("", 'n', false), std::make_tuple("n", 'n', false), + std::make_tuple("no", 'n', false), std::make_tuple("N", 'n', false), + std::make_tuple("No", 'n', false) + }; for (const auto& p : param_values) { @@ -350,7 +343,7 @@ namespace mamba { auto& ctx = Context::instance(); ctx.prefix_params.root_prefix = "/home/user/micromamba/"; - ctx.envs_dirs = {ctx.prefix_params.root_prefix / "envs"}; + ctx.envs_dirs = { ctx.prefix_params.root_prefix / "envs" }; fs::u8path prefix = "/home/user/micromamba/envs/testprefix"; CHECK_EQ(env_name(prefix), "testprefix"); @@ -507,35 +500,35 @@ namespace mamba { if (!on_win) { - std::vector args1 = {"python", "-c", "print('is\ngreat')"}; + std::vector args1 = { "python", "-c", "print('is\ngreat')" }; CHECK_EQ(quote_for_shell(args1), "python -c 'print('\"'\"'is\ngreat'\"'\"')'"); - std::vector args2 = {"python", "-c", "print(\"is great\")"}; + std::vector args2 = { "python", "-c", "print(\"is great\")" }; CHECK_EQ(quote_for_shell(args2), "python -c 'print(\"is great\")'"); - std::vector args3 = {"python", "very nice", "print(\"is great\")"}; + std::vector args3 = { "python", "very nice", "print(\"is great\")" }; CHECK_EQ(quote_for_shell(args3), "python 'very nice' 'print(\"is great\")'"); - std::vector args4 = {"pyt \t tab", "very nice", "print(\"is great\")"}; + std::vector args4 = { "pyt \t tab", "very nice", "print(\"is great\")" }; CHECK_EQ(quote_for_shell(args4), "'pyt \t tab' 'very nice' 'print(\"is great\")'"); - std::vector args5 = {"echo", "("}; + std::vector args5 = { "echo", "(" }; CHECK_EQ(quote_for_shell(args5), "echo '('"); - std::vector args6 = {"echo", "foo'bar\nspam"}; + std::vector args6 = { "echo", "foo'bar\nspam" }; CHECK_EQ(quote_for_shell(args6), "echo 'foo'\"'\"'bar\nspam'"); } - std::vector args1 = {"a b c", "d", "e"}; + std::vector args1 = { "a b c", "d", "e" }; CHECK_EQ(quote_for_shell(args1, "cmdexe"), "\"a b c\" d e"); - std::vector args2 = {"ab\"c", "\\", "d"}; + std::vector args2 = { "ab\"c", "\\", "d" }; CHECK_EQ(quote_for_shell(args2, "cmdexe"), "ab\\\"c \\ d"); - std::vector args3 = {"ab\"c", " \\", "d"}; + std::vector args3 = { "ab\"c", " \\", "d" }; CHECK_EQ(quote_for_shell(args3, "cmdexe"), "ab\\\"c \" \\\\\" d"); - std::vector args4 = {"a\\\\\\b", "de fg", "h"}; + std::vector args4 = { "a\\\\\\b", "de fg", "h" }; CHECK_EQ(quote_for_shell(args4, "cmdexe"), "a\\\\\\b \"de fg\" h"); - std::vector args5 = {"a\\\"b", "c", "d"}; + std::vector args5 = { "a\\\"b", "c", "d" }; CHECK_EQ(quote_for_shell(args5, "cmdexe"), "a\\\\\\\"b c d"); - std::vector args6 = {"a\\\\b c", "d", "e"}; + std::vector args6 = { "a\\\\b c", "d", "e" }; CHECK_EQ(quote_for_shell(args6, "cmdexe"), "\"a\\\\b c\" d e"); - std::vector args7 = {"a\\\\b\\ c", "d", "e"}; + std::vector args7 = { "a\\\\b\\ c", "d", "e" }; CHECK_EQ(quote_for_shell(args7, "cmdexe"), "\"a\\\\b\\ c\" d e"); - std::vector args8 = {"ab", ""}; + std::vector args8 = { "ab", "" }; CHECK_EQ(quote_for_shell(args8, "cmdexe"), "ab \"\""); } @@ -594,7 +587,9 @@ namespace mamba { TEST_CASE("parse_mod_etag") { - fs::u8path cache_folder = fs::u8path{test_data_dir / "repodata_json_cache"}; + bool old_value = Context::instance().repodata_use_zst; + Context::instance().repodata_use_zst = true; + fs::u8path cache_folder = fs::u8path{ test_data_dir / "repodata_json_cache" }; auto mq = detail::read_metadata(cache_folder / "test_1.json"); CHECK(mq.has_value()); auto j = mq.value(); @@ -670,6 +665,8 @@ namespace mamba CHECK_EQ(j.url, "https://conda.anaconda.org/conda-forge/noarch/repodata.json.zst"); CHECK_EQ(j.has_zst.value().value, true); CHECK_EQ(j.has_zst.value().last_checked, parse_utc_timestamp("2023-01-06T16:33:06Z")); + + Context::instance().repodata_use_zst = old_value; } } } // namespace mamba diff --git a/libmamba/tests/src/core/test_env_file_reading.cpp b/libmamba/tests/src/core/test_env_file_reading.cpp index 562a93c076..4334f2c792 100644 --- a/libmamba/tests/src/core/test_env_file_reading.cpp +++ b/libmamba/tests/src/core/test_env_file_reading.cpp @@ -47,19 +47,19 @@ namespace mamba using V = std::vector; auto res = detail::read_yaml_file(test_data_dir / "env_file/env_1.yaml"); CHECK_EQ(res.name, "env_1"); - CHECK_EQ(res.channels, V({"conda-forge", "bioconda"})); - CHECK_EQ(res.dependencies, V({"test1", "test2", "test3"})); + CHECK_EQ(res.channels, V({ "conda-forge", "bioconda" })); + CHECK_EQ(res.dependencies, V({ "test1", "test2", "test3" })); CHECK_FALSE(res.others_pkg_mgrs_specs.size()); auto res2 = detail::read_yaml_file(test_data_dir / "env_file/env_2.yaml"); CHECK_EQ(res2.name, "env_2"); - CHECK_EQ(res2.channels, V({"conda-forge", "bioconda"})); + CHECK_EQ(res2.channels, V({ "conda-forge", "bioconda" })); #ifdef __linux__ - CHECK_EQ(res2.dependencies, V({"test1-unix", "test1-linux", "test2-linux", "test4"})); + CHECK_EQ(res2.dependencies, V({ "test1-unix", "test1-linux", "test2-linux", "test4" })); #elif __APPLE__ - CHECK_EQ(res2.dependencies, V({"test1-unix", "test1-osx", "test4"})); + CHECK_EQ(res2.dependencies, V({ "test1-unix", "test1-osx", "test4" })); #elif _WIN32 - CHECK_EQ(res2.dependencies, V({"test1-win", "test4"})); + CHECK_EQ(res2.dependencies, V({ "test1-win", "test4" })); #endif CHECK_FALSE(res2.others_pkg_mgrs_specs.size()); } @@ -69,13 +69,13 @@ namespace mamba using V = std::vector; auto res = detail::read_yaml_file(test_data_dir / "env_file/env_3.yaml"); CHECK_EQ(res.name, "env_3"); - CHECK_EQ(res.channels, V({"conda-forge", "bioconda"})); - CHECK_EQ(res.dependencies, V({"test1", "test2", "test3", "pip"})); + CHECK_EQ(res.channels, V({ "conda-forge", "bioconda" })); + CHECK_EQ(res.dependencies, V({ "test1", "test2", "test3", "pip" })); CHECK_EQ(res.others_pkg_mgrs_specs.size(), 1); auto o = res.others_pkg_mgrs_specs[0]; CHECK_EQ(o.pkg_mgr, "pip"); - CHECK_EQ(o.deps, V({"pytest", "numpy"})); + CHECK_EQ(o.deps, V({ "pytest", "numpy" })); CHECK_EQ(o.cwd, fs::absolute(test_data_dir / "env_file")); } } diff --git a/libmamba/tests/src/core/test_env_lockfile.cpp b/libmamba/tests/src/core/test_env_lockfile.cpp index 509c074aac..6dd03a6d1f 100644 --- a/libmamba/tests/src/core/test_env_lockfile.cpp +++ b/libmamba/tests/src/core/test_env_lockfile.cpp @@ -32,7 +32,7 @@ namespace mamba const auto& error_details = EnvLockFileError::get_details(error); CHECK_EQ(file_parsing_error_code::parsing_failure, error_details.parsing_error_code); REQUIRE(error_details.yaml_error_type); - const std::type_index bad_file_error_id{typeid(YAML::BadFile)}; + const std::type_index bad_file_error_id{ typeid(YAML::BadFile) }; CHECK_EQ(bad_file_error_id, error_details.yaml_error_type.value()); // NOTE: one could attempt to check if opening a file which is not an YAML file @@ -44,8 +44,8 @@ namespace mamba TEST_CASE("invalid_version_fails") { ChannelContext channel_context; - const fs::u8path invalid_version_lockfile_path{ - test_data_dir / "env_lockfile/bad_version-lock.yaml"}; + const fs::u8path invalid_version_lockfile_path{ test_data_dir + / "env_lockfile/bad_version-lock.yaml" }; const auto maybe_lockfile = read_environment_lockfile( channel_context, invalid_version_lockfile_path @@ -60,7 +60,7 @@ namespace mamba TEST_CASE("valid_no_package_succeed") { ChannelContext channel_context; - const fs::u8path lockfile_path{test_data_dir / "env_lockfile/good_no_package-lock.yaml"}; + const fs::u8path lockfile_path{ test_data_dir / "env_lockfile/good_no_package-lock.yaml" }; const auto maybe_lockfile = read_environment_lockfile(channel_context, lockfile_path); REQUIRE_MESSAGE(maybe_lockfile, maybe_lockfile.error().what()); const auto lockfile = maybe_lockfile.value(); @@ -70,7 +70,7 @@ namespace mamba TEST_CASE("invalid_package_fails") { ChannelContext channel_context; - const fs::u8path lockfile_path{test_data_dir / "env_lockfile/bad_package-lock.yaml"}; + const fs::u8path lockfile_path{ test_data_dir / "env_lockfile/bad_package-lock.yaml" }; const auto maybe_lockfile = read_environment_lockfile(channel_context, lockfile_path); REQUIRE_FALSE(maybe_lockfile); const auto error = maybe_lockfile.error(); @@ -82,7 +82,8 @@ namespace mamba TEST_CASE("valid_one_package_succeed") { ChannelContext channel_context; - const fs::u8path lockfile_path{test_data_dir / "env_lockfile/good_one_package-lock.yaml"}; + const fs::u8path lockfile_path{ test_data_dir + / "env_lockfile/good_one_package-lock.yaml" }; const auto maybe_lockfile = read_environment_lockfile(channel_context, lockfile_path); REQUIRE_MESSAGE(maybe_lockfile, maybe_lockfile.error().what()); const auto lockfile = maybe_lockfile.value(); @@ -93,7 +94,8 @@ namespace mamba { ChannelContext channel_context; const fs::u8path lockfile_path{ - test_data_dir / "env_lockfile/good_one_package_missing_category-lock.yaml"}; + test_data_dir / "env_lockfile/good_one_package_missing_category-lock.yaml" + }; const auto maybe_lockfile = read_environment_lockfile(channel_context, lockfile_path); REQUIRE_MESSAGE(maybe_lockfile, maybe_lockfile.error().what()); const auto lockfile = maybe_lockfile.value(); @@ -103,8 +105,8 @@ namespace mamba TEST_CASE("valid_multiple_packages_succeed") { ChannelContext channel_context; - const fs::u8path lockfile_path{ - test_data_dir / "env_lockfile/good_multiple_packages-lock.yaml"}; + const fs::u8path lockfile_path{ test_data_dir + / "env_lockfile/good_multiple_packages-lock.yaml" }; const auto maybe_lockfile = read_environment_lockfile(channel_context, lockfile_path); REQUIRE_MESSAGE(maybe_lockfile, maybe_lockfile.error().what()); const auto lockfile = maybe_lockfile.value(); @@ -114,8 +116,8 @@ namespace mamba TEST_CASE("get_specific_packages") { ChannelContext channel_context; - const fs::u8path lockfile_path{ - test_data_dir / "env_lockfile/good_multiple_packages-lock.yaml"}; + const fs::u8path lockfile_path{ test_data_dir + / "env_lockfile/good_multiple_packages-lock.yaml" }; const auto lockfile = read_environment_lockfile(channel_context, lockfile_path).value(); CHECK(lockfile.get_packages_for("", "", "").empty()); { @@ -132,11 +134,11 @@ namespace mamba TEST_CASE("create_transaction_with_categories") { - const fs::u8path lockfile_path{ - test_data_dir / "env_lockfile/good_multiple_categories-lock.yaml"}; + const fs::u8path lockfile_path{ test_data_dir + / "env_lockfile/good_multiple_categories-lock.yaml" }; ChannelContext channel_context; - MPool pool{channel_context}; - mamba::MultiPackageCache pkg_cache({"/tmp/"}); + MPool pool{ channel_context }; + mamba::MultiPackageCache pkg_cache({ "/tmp/" }); auto& ctx = Context::instance(); @@ -166,10 +168,10 @@ namespace mamba } }; - check_categories({"main"}, 3, 5); - check_categories({"main", "dev"}, 31, 6); - check_categories({"dev"}, 28, 1); - check_categories({"nonesuch"}, 0, 0); + check_categories({ "main" }, 3, 5); + check_categories({ "main", "dev" }, 31, 6); + check_categories({ "dev" }, 28, 1); + check_categories({ "nonesuch" }, 0, 0); ctx.platform = ctx.host_platform; } @@ -186,12 +188,12 @@ namespace mamba CHECK(is_env_lockfile_name("../../some/dir/something-lock.yaml")); CHECK(is_env_lockfile_name("../../some/dir/something-lock.yml")); - CHECK(is_env_lockfile_name(fs::u8path{"something-lock.yaml"}.string())); - CHECK(is_env_lockfile_name(fs::u8path{"something-lock.yml"}.string())); - CHECK(is_env_lockfile_name(fs::u8path{"/some/dir/something-lock.yaml"}.string())); - CHECK(is_env_lockfile_name(fs::u8path{"/some/dir/something-lock.yml"}.string())); - CHECK(is_env_lockfile_name(fs::u8path{"../../some/dir/something-lock.yaml"}.string())); - CHECK(is_env_lockfile_name(fs::u8path{"../../some/dir/something-lock.yml"}.string())); + CHECK(is_env_lockfile_name(fs::u8path{ "something-lock.yaml" }.string())); + CHECK(is_env_lockfile_name(fs::u8path{ "something-lock.yml" }.string())); + CHECK(is_env_lockfile_name(fs::u8path{ "/some/dir/something-lock.yaml" }.string())); + CHECK(is_env_lockfile_name(fs::u8path{ "/some/dir/something-lock.yml" }.string())); + CHECK(is_env_lockfile_name(fs::u8path{ "../../some/dir/something-lock.yaml" }.string())); + CHECK(is_env_lockfile_name(fs::u8path{ "../../some/dir/something-lock.yml" }.string())); CHECK_FALSE(is_env_lockfile_name("something")); CHECK_FALSE(is_env_lockfile_name("something-lock")); @@ -205,10 +207,10 @@ namespace mamba CHECK_FALSE(is_env_lockfile_name("../../some/dir/something.yaml")); CHECK_FALSE(is_env_lockfile_name("../../some/dir/something.yml")); - CHECK_FALSE(is_env_lockfile_name(fs::u8path{"something"}.string())); - CHECK_FALSE(is_env_lockfile_name(fs::u8path{"something-lock"}.string())); - CHECK_FALSE(is_env_lockfile_name(fs::u8path{"/some/dir/something"}.string())); - CHECK_FALSE(is_env_lockfile_name(fs::u8path{"../../some/dir/something"}.string())); + CHECK_FALSE(is_env_lockfile_name(fs::u8path{ "something" }.string())); + CHECK_FALSE(is_env_lockfile_name(fs::u8path{ "something-lock" }.string())); + CHECK_FALSE(is_env_lockfile_name(fs::u8path{ "/some/dir/something" }.string())); + CHECK_FALSE(is_env_lockfile_name(fs::u8path{ "../../some/dir/something" }.string())); } } diff --git a/libmamba/tests/src/core/test_execution.cpp b/libmamba/tests/src/core/test_execution.cpp index 1655e4e529..aa095b9429 100644 --- a/libmamba/tests/src/core/test_execution.cpp +++ b/libmamba/tests/src/core/test_execution.cpp @@ -68,7 +68,7 @@ namespace mamba { constexpr std::size_t arbitrary_task_count = 2048; constexpr std::size_t arbitrary_tasks_per_generator = 24; - std::atomic counter{0}; + std::atomic counter{ 0 }; { MainExecutor executor; @@ -85,7 +85,7 @@ namespace mamba { constexpr std::size_t arbitrary_task_count = 2048; constexpr std::size_t arbitrary_tasks_per_generator = 36; - std::atomic counter{0}; + std::atomic counter{ 0 }; { MainExecutor executor; diff --git a/libmamba/tests/src/core/test_filesystem.cpp b/libmamba/tests/src/core/test_filesystem.cpp index de3a09548e..90dcb30dbb 100644 --- a/libmamba/tests/src/core/test_filesystem.cpp +++ b/libmamba/tests/src/core/test_filesystem.cpp @@ -19,7 +19,7 @@ namespace mamba TEST_CASE("normalized_separators") { static constexpr auto value = u8"a/b/c"; - std::filesystem::path x{value}; + std::filesystem::path x{ value }; const auto y = fs::normalized_separators(x); #if defined(_WIN32) REQUIRE_EQ(y.u8string(), u8R"(a\b\c)"); @@ -84,7 +84,7 @@ namespace mamba { const auto path_to_search_from = file_dir.parent_path(); - fs::recursive_directory_iterator it{path_to_search_from}; + fs::recursive_directory_iterator it{ path_to_search_from }; auto first_entry = *it; CHECK_EQ(first_entry.path(), file_path.parent_path()); auto secibd_entry = *(++it); @@ -190,9 +190,8 @@ namespace mamba const auto readonly_file_path = tmp_dir / "fs-readonly-file"; { - std::ofstream readonly_file{ - readonly_file_path.std_path(), - readonly_file.binary | readonly_file.trunc}; + std::ofstream readonly_file{ readonly_file_path.std_path(), + readonly_file.binary | readonly_file.trunc }; readonly_file << "delete me" << std::endl; } @@ -237,9 +236,8 @@ namespace mamba const auto readonly_file_path = dir_path / fmt::format("readonly-file-{}", file_idx); { - std::ofstream readonly_file{ - readonly_file_path.std_path(), - readonly_file.binary | readonly_file.trunc}; + std::ofstream readonly_file{ readonly_file_path.std_path(), + readonly_file.binary | readonly_file.trunc }; readonly_file << "delete me" << std::endl; } @@ -273,7 +271,7 @@ namespace mamba return subdirs; }; - std::vector dirs{tmp_dir}; + std::vector dirs{ tmp_dir }; for (int depth = 0; depth < tree_depth; ++depth) { dirs = create_subdirs(dirs); diff --git a/libmamba/tests/src/core/test_invoke.cpp b/libmamba/tests/src/core/test_invoke.cpp index 4d99b2124d..2474376ede 100644 --- a/libmamba/tests/src/core/test_invoke.cpp +++ b/libmamba/tests/src/core/test_invoke.cpp @@ -82,7 +82,7 @@ namespace mamba } }; - auto result = safe_invoke(DoNotDoThisAtHome{did_move_happened}); + auto result = safe_invoke(DoNotDoThisAtHome{ did_move_happened }); CHECK_FALSE(result); CHECK_MESSAGE(ends_with(result.error().what(), "unknown error"), result.error().what()); CHECK(did_move_happened); diff --git a/libmamba/tests/src/core/test_lockfile.cpp b/libmamba/tests/src/core/test_lockfile.cpp index 65969c8c03..78aeba56a9 100644 --- a/libmamba/tests/src/core/test_lockfile.cpp +++ b/libmamba/tests/src/core/test_lockfile.cpp @@ -66,7 +66,7 @@ namespace mamba { TEST_CASE_FIXTURE(LockDirTest, "basics") { - mamba::LockFile lock{tempdir_path}; + mamba::LockFile lock{ tempdir_path }; CHECK(lock); { auto new_lock = std::move(lock); @@ -135,7 +135,7 @@ namespace mamba CHECK(mamba::LockFile::is_locked(lock)); // Check lock status from another process - args = {lock_exe, "is-locked", lock.lockfile_path().string()}; + args = { lock_exe, "is-locked", lock.lockfile_path().string() }; out.clear(); err.clear(); reproc::run( @@ -157,7 +157,7 @@ namespace mamba CHECK(is_locked); // Try to lock from another process - args = {lock_exe, "lock", "--timeout=1", tempdir_path.string()}; + args = { lock_exe, "lock", "--timeout=1", tempdir_path.string() }; out.clear(); err.clear(); reproc::run( @@ -182,7 +182,7 @@ namespace mamba fs::u8path lock_path = tempdir_path / (tempdir_path.filename().string() + ".lock"); CHECK_FALSE(fs::exists(lock_path)); - args = {lock_exe, "is-locked", lock_path.string()}; + args = { lock_exe, "is-locked", lock_path.string() }; out.clear(); err.clear(); reproc::run(args, reproc::options{}, reproc::sink::string(out), reproc::sink::string(err)); @@ -225,13 +225,13 @@ namespace mamba TEST_CASE_FIXTURE(LockFileTest, "same_pid") { { - LockFile lock{tempfile_path}; + LockFile lock{ tempfile_path }; CHECK(lock.is_locked()); CHECK(fs::exists(lock.lockfile_path())); CHECK_EQ(lock.count_lock_owners(), 1); { - LockFile other_lock{tempfile_path}; + LockFile other_lock{ tempfile_path }; CHECK(other_lock.is_locked()); CHECK_EQ(other_lock.count_lock_owners(), 2); CHECK_EQ(lock.count_lock_owners(), 2); @@ -259,7 +259,7 @@ namespace mamba CHECK(mamba::LockFile::is_locked(lock)); // Check lock status from another process - args = {lock_exe, "is-locked", lock.lockfile_path().string()}; + args = { lock_exe, "is-locked", lock.lockfile_path().string() }; out.clear(); err.clear(); reproc::run( @@ -281,7 +281,7 @@ namespace mamba CHECK(is_locked); // Try to lock from another process - args = {lock_exe, "lock", "--timeout=1", tempfile_path.string()}; + args = { lock_exe, "lock", "--timeout=1", tempfile_path.string() }; out.clear(); err.clear(); reproc::run( @@ -306,7 +306,7 @@ namespace mamba fs::u8path lock_path = tempfile_path.string() + ".lock"; CHECK_FALSE(fs::exists(lock_path)); - args = {lock_exe, "is-locked", lock_path.string()}; + args = { lock_exe, "is-locked", lock_path.string() }; out.clear(); err.clear(); reproc::run(args, reproc::options{}, reproc::sink::string(out), reproc::sink::string(err)); diff --git a/libmamba/tests/src/core/test_pinning.cpp b/libmamba/tests/src/core/test_pinning.cpp index fbcf0f9ec0..d1c72e36ba 100644 --- a/libmamba/tests/src/core/test_pinning.cpp +++ b/libmamba/tests/src/core/test_pinning.cpp @@ -31,63 +31,63 @@ namespace mamba PrefixData& prefix_data = sprefix_data.value(); REQUIRE_EQ(prefix_data.records().size(), 0); - specs = {"python"}; + specs = { "python" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"python-test"}; + specs = { "python-test" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"python=3"}; + specs = { "python=3" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"python==3.8"}; + specs = { "python==3.8" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"python==3.8.3"}; + specs = { "python==3.8.3" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"numpy"}; + specs = { "numpy" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); PackageInfo pkg_info("python", "3.7.10", "abcde", 0); - prefix_data.add_packages({pkg_info}); + prefix_data.add_packages({ pkg_info }); REQUIRE_EQ(prefix_data.records().size(), 1); - specs = {"python"}; + specs = { "python" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"numpy"}; + specs = { "numpy" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, "python 3.7.*"); - specs = {"python-test"}; + specs = { "python-test" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, "python 3.7.*"); - specs = {"python==3"}; + specs = { "python==3" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"python=3.*"}; + specs = { "python=3.*" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"python=3.8"}; + specs = { "python=3.8" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"python=3.8.3"}; + specs = { "python=3.8.3" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); - specs = {"numpy", "python"}; + specs = { "numpy", "python" }; pin = python_pin(prefix_data, specs); CHECK_EQ(pin, ""); } diff --git a/libmamba/tests/src/core/test_satisfiability_error.cpp b/libmamba/tests/src/core/test_satisfiability_error.cpp index bfe1a3d176..55c2d9ef0d 100644 --- a/libmamba/tests/src/core/test_satisfiability_error.cpp +++ b/libmamba/tests/src/core/test_satisfiability_error.cpp @@ -53,7 +53,7 @@ TEST_SUITE("conflict_map") TEST_CASE("remove") { - auto c = conflict_map({{1, 1}, {1, 2}, {1, 3}, {2, 4}}); + auto c = conflict_map({ { 1, 1 }, { 1, 2 }, { 1, 3 }, { 2, 4 } }); REQUIRE_EQ(c.size(), 4); REQUIRE(c.in_conflict(2, 4)); @@ -148,9 +148,12 @@ namespace ); const auto repodata_f = create_repodata_json(tmp_dir.path, packages); - auto pool = MPool{channel_context}; - MRepo(pool, "some-name", repodata_f, RepoMetadata{/* .url= */ "some-url"}); - auto solver = MSolver(std::move(pool), std::vector{std::pair{SOLVER_FLAG_ALLOW_DOWNGRADE, 1}}); + auto pool = MPool{ channel_context }; + MRepo(pool, "some-name", repodata_f, RepoMetadata{ /* .url= */ "some-url" }); + auto solver = MSolver( + std::move(pool), + std::vector{ std::pair{ SOLVER_FLAG_ALLOW_DOWNGRADE, 1 } } + ); solver.add_jobs(specs, SOLVER_INSTALL); return solver; @@ -159,7 +162,7 @@ namespace TEST_CASE("Test create_problem utility") { - auto solver = create_problem(std::array{mkpkg("foo", "0.1.0", {})}, {"foo"}); + auto solver = create_problem(std::array{ mkpkg("foo", "0.1.0", {}) }, { "foo" }); const auto solved = solver.try_solve(); REQUIRE(solved); } @@ -174,7 +177,7 @@ namespace mkpkg("A", "0.2.0"), mkpkg("A", "0.3.0"), }, - {"A=0.4.0"} + { "A=0.4.0" } ); } @@ -188,61 +191,61 @@ namespace { return create_problem( std::array{ - mkpkg("menu", "1.5.0", {"dropdown=2.*"}), - mkpkg("menu", "1.4.0", {"dropdown=2.*"}), - mkpkg("menu", "1.3.0", {"dropdown=2.*"}), - mkpkg("menu", "1.2.0", {"dropdown=2.*"}), - mkpkg("menu", "1.1.0", {"dropdown=2.*"}), - mkpkg("menu", "1.0.0", {"dropdown=1.*"}), - mkpkg("dropdown", "2.3.0", {"icons=2.*"}), - mkpkg("dropdown", "2.2.0", {"icons=2.*"}), - mkpkg("dropdown", "2.1.0", {"icons=2.*"}), - mkpkg("dropdown", "2.0.0", {"icons=2.*"}), - mkpkg("dropdown", "1.8.0", {"icons=1.*", "intl=3.*"}), + mkpkg("menu", "1.5.0", { "dropdown=2.*" }), + mkpkg("menu", "1.4.0", { "dropdown=2.*" }), + mkpkg("menu", "1.3.0", { "dropdown=2.*" }), + mkpkg("menu", "1.2.0", { "dropdown=2.*" }), + mkpkg("menu", "1.1.0", { "dropdown=2.*" }), + mkpkg("menu", "1.0.0", { "dropdown=1.*" }), + mkpkg("dropdown", "2.3.0", { "icons=2.*" }), + mkpkg("dropdown", "2.2.0", { "icons=2.*" }), + mkpkg("dropdown", "2.1.0", { "icons=2.*" }), + mkpkg("dropdown", "2.0.0", { "icons=2.*" }), + mkpkg("dropdown", "1.8.0", { "icons=1.*", "intl=3.*" }), mkpkg("icons", "2.0.0"), mkpkg("icons", "1.0.0"), mkpkg("intl", "5.0.0"), mkpkg("intl", "4.0.0"), mkpkg("intl", "3.0.0"), }, - {"menu", "icons=1.*", "intl=5.*"} + { "menu", "icons=1.*", "intl=5.*" } ); } auto create_pubgrub_hard_(bool missing_package) -> MSolver { auto packages = std::vector{ - mkpkg("menu", "2.1.0", {"dropdown>=2.1", "emoji"}), - mkpkg("menu", "2.0.1", {"dropdown>=2", "emoji"}), - mkpkg("menu", "2.0.0", {"dropdown>=2", "emoji"}), - mkpkg("menu", "1.5.0", {"dropdown=2.*", "emoji"}), - mkpkg("menu", "1.4.0", {"dropdown=2.*", "emoji"}), - mkpkg("menu", "1.3.0", {"dropdown=2.*"}), - mkpkg("menu", "1.2.0", {"dropdown=2.*"}), - mkpkg("menu", "1.1.0", {"dropdown=1.*"}), - mkpkg("menu", "1.0.0", {"dropdown=1.*"}), - mkpkg("emoji", "1.1.0", {"libicons=2.*"}), - mkpkg("emoji", "1.0.0", {"libicons=2.*"}), - mkpkg("dropdown", "2.3.0", {"libicons=2.*"}), - mkpkg("dropdown", "2.2.0", {"libicons=2.*"}), - mkpkg("dropdown", "2.1.0", {"libicons=2.*"}), - mkpkg("dropdown", "2.0.0", {"libicons=2.*"}), - mkpkg("dropdown", "1.8.0", {"libicons=1.*", "intl=3.*"}), - mkpkg("dropdown", "1.7.0", {"libicons=1.*", "intl=3.*"}), - mkpkg("dropdown", "1.6.0", {"libicons=1.*", "intl=3.*"}), - mkpkg("pyicons", "2.0.0", {"libicons=2.*"}), - mkpkg("pyicons", "1.1.0", {"libicons=1.2.*"}), - mkpkg("pyicons", "1.0.0", {"libicons=1.*"}), - mkpkg("pretty", "1.1.0", {"pyicons=1.1.*"}), - mkpkg("pretty", "1.0.1", {"pyicons=1.*"}), - mkpkg("pretty", "1.0.0", {"pyicons=1.*"}), + mkpkg("menu", "2.1.0", { "dropdown>=2.1", "emoji" }), + mkpkg("menu", "2.0.1", { "dropdown>=2", "emoji" }), + mkpkg("menu", "2.0.0", { "dropdown>=2", "emoji" }), + mkpkg("menu", "1.5.0", { "dropdown=2.*", "emoji" }), + mkpkg("menu", "1.4.0", { "dropdown=2.*", "emoji" }), + mkpkg("menu", "1.3.0", { "dropdown=2.*" }), + mkpkg("menu", "1.2.0", { "dropdown=2.*" }), + mkpkg("menu", "1.1.0", { "dropdown=1.*" }), + mkpkg("menu", "1.0.0", { "dropdown=1.*" }), + mkpkg("emoji", "1.1.0", { "libicons=2.*" }), + mkpkg("emoji", "1.0.0", { "libicons=2.*" }), + mkpkg("dropdown", "2.3.0", { "libicons=2.*" }), + mkpkg("dropdown", "2.2.0", { "libicons=2.*" }), + mkpkg("dropdown", "2.1.0", { "libicons=2.*" }), + mkpkg("dropdown", "2.0.0", { "libicons=2.*" }), + mkpkg("dropdown", "1.8.0", { "libicons=1.*", "intl=3.*" }), + mkpkg("dropdown", "1.7.0", { "libicons=1.*", "intl=3.*" }), + mkpkg("dropdown", "1.6.0", { "libicons=1.*", "intl=3.*" }), + mkpkg("pyicons", "2.0.0", { "libicons=2.*" }), + mkpkg("pyicons", "1.1.0", { "libicons=1.2.*" }), + mkpkg("pyicons", "1.0.0", { "libicons=1.*" }), + mkpkg("pretty", "1.1.0", { "pyicons=1.1.*" }), + mkpkg("pretty", "1.0.1", { "pyicons=1.*" }), + mkpkg("pretty", "1.0.0", { "pyicons=1.*" }), mkpkg("intl", "5.0.0"), mkpkg("intl", "4.0.0"), mkpkg("intl", "3.2.0"), mkpkg("intl", "3.1.0"), mkpkg("intl", "3.0.0"), - mkpkg("intl-mod", "1.0.0", {"intl=5.0.*"}), - mkpkg("intl-mod", "1.0.1", {"intl=5.0.*"}), + mkpkg("intl-mod", "1.0.0", { "intl=5.0.*" }), + mkpkg("intl-mod", "1.0.1", { "intl=5.0.*" }), mkpkg("libicons", "2.1.0"), mkpkg("libicons", "2.0.1"), mkpkg("libicons", "2.0.0"), @@ -253,12 +256,15 @@ namespace if (missing_package) { - packages.push_back(mkpkg("dropdown", "2.9.3", {"libnothere>1.0"})); - packages.push_back(mkpkg("dropdown", "2.9.2", {"libicons>10.0", "libnothere>1.0"})); - packages.push_back(mkpkg("dropdown", "2.9.1", {"libicons>10.0", "libnothere>1.0"})); - packages.push_back(mkpkg("dropdown", "2.9.0", {"libicons>10.0"})); + packages.push_back(mkpkg("dropdown", "2.9.3", { "libnothere>1.0" })); + packages.push_back(mkpkg("dropdown", "2.9.2", { "libicons>10.0", "libnothere>1.0" })); + packages.push_back(mkpkg("dropdown", "2.9.1", { "libicons>10.0", "libnothere>1.0" })); + packages.push_back(mkpkg("dropdown", "2.9.0", { "libicons>10.0" })); } - return create_problem(packages, {"menu", "pyicons=1.*", "intl=5.*", "intl-mod", "pretty>=1.0"}); + return create_problem( + packages, + { "menu", "pyicons=1.*", "intl=5.*", "intl-mod", "pretty>=1.0" } + ); } /** @@ -326,9 +332,9 @@ namespace */ auto create_conda_forge( std::vector&& specs, - const std::vector& virtual_packages = {mkpkg("__glibc", "2.17.0")}, - std::vector&& channels = {"conda-forge"}, - const std::vector& platforms = {"linux-64", "noarch"} + const std::vector& virtual_packages = { mkpkg("__glibc", "2.17.0") }, + std::vector&& channels = { "conda-forge" }, + const std::vector& platforms = { "linux-64", "noarch" } ) -> MSolver { ChannelContext channel_context = {}; @@ -341,11 +347,11 @@ namespace PrefixData::create(tmp_dir.path / "prefix", channel_context) ); prefix_data.add_packages(virtual_packages); - auto pool = MPool{channel_context}; - auto repo = MRepo{pool, prefix_data}; + auto pool = MPool{ channel_context }; + auto repo = MRepo{ pool, prefix_data }; repo.set_installed(); - auto cache = MultiPackageCache({tmp_dir.path / "cache"}); + auto cache = MultiPackageCache({ tmp_dir.path / "cache" }); create_cache_dir(cache.first_writable_path()); bool prev_progress_bars_value = Context::instance().graphics_params.no_progress_bars; @@ -353,7 +359,10 @@ namespace load_channels(pool, cache, make_platform_channels(std::move(channels), platforms)); Context::instance().graphics_params.no_progress_bars = prev_progress_bars_value; - auto solver = MSolver(std::move(pool), std::vector{std::pair{SOLVER_FLAG_ALLOW_DOWNGRADE, 1}}); + auto solver = MSolver( + std::move(pool), + std::vector{ std::pair{ SOLVER_FLAG_ALLOW_DOWNGRADE, 1 } } + ); solver.add_jobs(specs, SOLVER_INSTALL); return solver; @@ -362,7 +371,7 @@ namespace TEST_CASE("Test create_conda_forge utility ") { - auto solver = create_conda_forge({"xtensor>=0.7"}); + auto solver = create_conda_forge({ "xtensor>=0.7" }); const auto solved = solver.try_solve(); REQUIRE(solved); } @@ -371,50 +380,50 @@ namespace { auto create_pytorch_cpu() -> MSolver { - return create_conda_forge({"python=2.7", "pytorch=1.12"}); + return create_conda_forge({ "python=2.7", "pytorch=1.12" }); } auto create_pytorch_cuda() -> MSolver { return create_conda_forge( - {"python=2.7", "pytorch=1.12"}, - {mkpkg("__glibc", "2.17.0"), mkpkg("__cuda", "10.2.0")} + { "python=2.7", "pytorch=1.12" }, + { mkpkg("__glibc", "2.17.0"), mkpkg("__cuda", "10.2.0") } ); } auto create_cudatoolkit() -> MSolver { return create_conda_forge( - {"python=3.7", "cudatoolkit=11.1", "cudnn=8.0", "pytorch=1.8", "torchvision=0.9=*py37_cu111*"}, - {mkpkg("__glibc", "2.17.0"), mkpkg("__cuda", "11.1")} + { "python=3.7", "cudatoolkit=11.1", "cudnn=8.0", "pytorch=1.8", "torchvision=0.9=*py37_cu111*" }, + { mkpkg("__glibc", "2.17.0"), mkpkg("__cuda", "11.1") } ); } auto create_jpeg9b() -> MSolver { - return create_conda_forge({"python=3.7", "jpeg=9b"}); + return create_conda_forge({ "python=3.7", "jpeg=9b" }); } auto create_r_base() -> MSolver { return create_conda_forge( - {"r-base=3.5.* ", "pandas=0", "numpy<1.20.0", "matplotlib=2", "r-matchit=4.*"} + { "r-base=3.5.* ", "pandas=0", "numpy<1.20.0", "matplotlib=2", "r-matchit=4.*" } ); } auto create_scip() -> MSolver { - return create_conda_forge({"scip=8.*", "pyscipopt<4.0"}); + return create_conda_forge({ "scip=8.*", "pyscipopt<4.0" }); } auto create_double_python() -> MSolver { - return create_conda_forge({"python=3.9.*", "python=3.10.*"}); + return create_conda_forge({ "python=3.9.*", "python=3.10.*" }); } auto create_numba() -> MSolver { - return create_conda_forge({"python=3.11", "numba<0.56"}); + return create_conda_forge({ "python=3.11", "numba<0.56" }); } template @@ -441,7 +450,7 @@ TEST_CASE("NamedList") static constexpr std::size_t n_packages = 9; for (std::size_t minor = 1; minor <= n_packages; ++minor) { - l.insert({mkpkg("pkg", fmt::format("0.{}.0", minor))}); + l.insert({ mkpkg("pkg", fmt::format("0.{}.0", minor)) }); } CHECK_EQ(l.size(), n_packages); CHECK_EQ(l.name(), "pkg"); @@ -473,18 +482,18 @@ TEST_CASE("Create problem graph") using CpPbGr = CompressedProblemsGraph; const auto issues = std::array{ - std::pair{"Basic conflict", &create_basic_conflict}, - std::pair{"PubGrub example", &create_pubgrub}, - std::pair{"Harder PubGrub example", &create_pubgrub_hard}, - std::pair{"PubGrub example with missing packages", &create_pubgrub_missing}, - std::pair{"PyTorch CPU", &create_pytorch_cpu}, - std::pair{"PyTorch Cuda", &create_pytorch_cuda}, - std::pair{"Cuda Toolkit", &create_cudatoolkit}, - std::pair{"Jpeg", &create_jpeg9b}, - std::pair{"R base", &create_r_base}, - std::pair{"SCIP", &create_scip}, - std::pair{"Two different Python", &create_double_python}, - std::pair{"Numba", &create_numba}, + std::pair{ "Basic conflict", &create_basic_conflict }, + std::pair{ "PubGrub example", &create_pubgrub }, + std::pair{ "Harder PubGrub example", &create_pubgrub_hard }, + std::pair{ "PubGrub example with missing packages", &create_pubgrub_missing }, + std::pair{ "PyTorch CPU", &create_pytorch_cpu }, + std::pair{ "PyTorch Cuda", &create_pytorch_cuda }, + std::pair{ "Cuda Toolkit", &create_cudatoolkit }, + std::pair{ "Jpeg", &create_jpeg9b }, + std::pair{ "R base", &create_r_base }, + std::pair{ "SCIP", &create_scip }, + std::pair{ "Two different Python", &create_double_python }, + std::pair{ "Numba", &create_numba }, }; for (const auto& [name, factory] : issues) diff --git a/libmamba/tests/src/core/test_system_env.cpp b/libmamba/tests/src/core/test_system_env.cpp index 5378c46cde..eece2b4a14 100644 --- a/libmamba/tests/src/core/test_system_env.cpp +++ b/libmamba/tests/src/core/test_system_env.cpp @@ -53,18 +53,10 @@ TEST_SUITE("system_env") { // We check that normal pre-defined variables are accessible and do not fail access even if // some of these values have unicode. - const std::vector predefined_keys{ - "PATH", - "OS", - "PATHEXT", - "ProgramData", - "SystemRoot", - "windir", - "APPDATA", - "COMPUTERNAME", - "TEMP", - "UserName", - "USERPROFILE"}; + const std::vector predefined_keys{ "PATH", "OS", "PATHEXT", + "ProgramData", "SystemRoot", "windir", + "APPDATA", "COMPUTERNAME", "TEMP", + "UserName", "USERPROFILE" }; for (const auto& key : predefined_keys) { diff --git a/libmamba/tests/src/core/test_tasksync.cpp b/libmamba/tests/src/core/test_tasksync.cpp index 1fec3d5ccb..172db067cf 100644 --- a/libmamba/tests/src/core/test_tasksync.cpp +++ b/libmamba/tests/src/core/test_tasksync.cpp @@ -128,11 +128,11 @@ namespace mamba std::string sequence; TaskSynchronizer task_sync; - const auto unlock_duration = std::chrono::seconds{1}; - std::atomic task_started{false}; - std::atomic task_continue{false}; - std::atomic unlocker_ready{false}; - std::atomic unlocker_start{false}; + const auto unlock_duration = std::chrono::seconds{ 1 }; + std::atomic task_started{ false }; + std::atomic task_continue{ false }; + std::atomic unlocker_ready{ false }; + std::atomic unlocker_start{ false }; auto ft_task = std::async( std::launch::async, diff --git a/libmamba/tests/src/core/test_thread_utils.cpp b/libmamba/tests/src/core/test_thread_utils.cpp index f2d21a0176..3507ea4df4 100644 --- a/libmamba/tests/src/core/test_thread_utils.cpp +++ b/libmamba/tests/src/core/test_thread_utils.cpp @@ -52,7 +52,7 @@ namespace mamba ++res; } std::this_thread::sleep_for(std::chrono::milliseconds(300)); - }}.extract()); + } }.extract()); } if (interrupt) { diff --git a/libmamba/tests/src/core/test_transfer.cpp b/libmamba/tests/src/core/test_transfer.cpp index dbe3b5e3c1..a6b4dd554f 100644 --- a/libmamba/tests/src/core/test_transfer.cpp +++ b/libmamba/tests/src/core/test_transfer.cpp @@ -22,7 +22,7 @@ namespace mamba mamba::ChannelContext channel_context; const mamba::Channel& c = channel_context.make_channel("conda-forge"); mamba::MultiDownloadTarget multi_dl; - mamba::MultiPackageCache pkg_cache({"/tmp/"}); + mamba::MultiPackageCache pkg_cache({ "/tmp/" }); mamba::MSubdirData cf = mamba::MSubdirData::create( c, "linux-64", @@ -44,7 +44,7 @@ namespace mamba mamba::ChannelContext channel_context; const mamba::Channel& c = channel_context.make_channel("conda-forge"); mamba::MultiDownloadTarget multi_dl; - mamba::MultiPackageCache pkg_cache({"/tmp/"}); + mamba::MultiPackageCache pkg_cache({ "/tmp/" }); mamba::MSubdirData cf = mamba::MSubdirData::create( c, "noarch", diff --git a/libmamba/tests/src/core/test_url.cpp b/libmamba/tests/src/core/test_url.cpp index 2fa11cfa8b..948543b938 100644 --- a/libmamba/tests/src/core/test_url.cpp +++ b/libmamba/tests/src/core/test_url.cpp @@ -16,19 +16,10 @@ namespace mamba { const std::vector KNOWN_PLATFORMS = { - "noarch", - "linux-32", - "linux-64", - "linux-aarch64", - "linux-armv6l", - "linux-armv7l", - "linux-ppc64le", - "linux-ppc64", - "osx-64", - "osx-arm64", - "win-32", - "win-64", - "zos-z"}; + "noarch", "linux-32", "linux-64", "linux-aarch64", "linux-armv6l", + "linux-armv7l", "linux-ppc64le", "linux-ppc64", "osx-64", "osx-arm64", + "win-32", "win-64", "zos-z" + }; TEST_SUITE("url") { @@ -68,7 +59,7 @@ namespace mamba std::string platform_found, cleaned_url; split_platform( - {"noarch", "linux-64"}, + { "noarch", "linux-64" }, "https://mamba.com/linux-64/package.tar.bz2", ctx.platform, cleaned_url, @@ -79,7 +70,7 @@ namespace mamba CHECK_EQ(cleaned_url, "https://mamba.com/package.tar.bz2"); split_platform( - {"noarch", "linux-64"}, + { "noarch", "linux-64" }, "https://mamba.com/linux-64/noarch-package.tar.bz2", ctx.platform, cleaned_url, @@ -89,7 +80,7 @@ namespace mamba CHECK_EQ(cleaned_url, "https://mamba.com/noarch-package.tar.bz2"); split_platform( - {"linux-64", "osx-arm64", "noarch"}, + { "linux-64", "osx-arm64", "noarch" }, "https://mamba.com/noarch/kernel_linux-64-package.tar.bz2", ctx.platform, cleaned_url, @@ -99,7 +90,7 @@ namespace mamba CHECK_EQ(cleaned_url, "https://mamba.com/kernel_linux-64-package.tar.bz2"); split_platform( - {"noarch", "linux-64"}, + { "noarch", "linux-64" }, "https://mamba.com/linux-64", ctx.platform, cleaned_url, @@ -110,7 +101,7 @@ namespace mamba CHECK_EQ(cleaned_url, "https://mamba.com"); split_platform( - {"noarch", "linux-64"}, + { "noarch", "linux-64" }, "https://mamba.com/noarch", ctx.platform, cleaned_url, diff --git a/libmamba/tests/src/core/test_util.cpp b/libmamba/tests/src/core/test_util.cpp index 026a5cb771..86a8393f55 100644 --- a/libmamba/tests/src/core/test_util.cpp +++ b/libmamba/tests/src/core/test_util.cpp @@ -38,7 +38,8 @@ namespace mamba void* pointer_to_this_thread_rng = same_thread_checks(); void* pointer_to_another_thread_rng = nullptr; - std::thread another_thread{[&] { pointer_to_another_thread_rng = same_thread_checks(); }}; + std::thread another_thread{ [&] + { pointer_to_another_thread_rng = same_thread_checks(); } }; another_thread.join(); CHECK_NE(pointer_to_this_thread_rng, pointer_to_another_thread_rng); @@ -67,7 +68,7 @@ namespace mamba { bool executed = false; { - on_scope_exit _{[&] { executed = true; }}; + on_scope_exit _{ [&] { executed = true; } }; CHECK_FALSE(executed); } CHECK(executed); @@ -87,24 +88,24 @@ namespace mamba CHECK(is_yaml_file_name("../../some/dir/something.yml")); CHECK(is_yaml_file_name("../../some/dir/something.yml")); - CHECK(is_yaml_file_name(fs::u8path{"something.yaml"}.string())); - CHECK(is_yaml_file_name(fs::u8path{"something.yml"}.string())); - CHECK(is_yaml_file_name(fs::u8path{"something-lock.yaml"}.string())); - CHECK(is_yaml_file_name(fs::u8path{"something-lock.yml"}.string())); - CHECK(is_yaml_file_name(fs::u8path{"/some/dir/something.yaml"}.string())); - CHECK(is_yaml_file_name(fs::u8path{"/some/dir/something.yml"}.string())); - CHECK(is_yaml_file_name(fs::u8path{"../../some/dir/something.yaml"}.string())); - CHECK(is_yaml_file_name(fs::u8path{"../../some/dir/something.yml"}.string())); + CHECK(is_yaml_file_name(fs::u8path{ "something.yaml" }.string())); + CHECK(is_yaml_file_name(fs::u8path{ "something.yml" }.string())); + CHECK(is_yaml_file_name(fs::u8path{ "something-lock.yaml" }.string())); + CHECK(is_yaml_file_name(fs::u8path{ "something-lock.yml" }.string())); + CHECK(is_yaml_file_name(fs::u8path{ "/some/dir/something.yaml" }.string())); + CHECK(is_yaml_file_name(fs::u8path{ "/some/dir/something.yml" }.string())); + CHECK(is_yaml_file_name(fs::u8path{ "../../some/dir/something.yaml" }.string())); + CHECK(is_yaml_file_name(fs::u8path{ "../../some/dir/something.yml" }.string())); CHECK_FALSE(is_yaml_file_name("something")); CHECK_FALSE(is_yaml_file_name("something-lock")); CHECK_FALSE(is_yaml_file_name("/some/dir/something")); CHECK_FALSE(is_yaml_file_name("../../some/dir/something")); - CHECK_FALSE(is_yaml_file_name(fs::u8path{"something"}.string())); - CHECK_FALSE(is_yaml_file_name(fs::u8path{"something-lock"}.string())); - CHECK_FALSE(is_yaml_file_name(fs::u8path{"/some/dir/something"}.string())); - CHECK_FALSE(is_yaml_file_name(fs::u8path{"../../some/dir/something"}.string())); + CHECK_FALSE(is_yaml_file_name(fs::u8path{ "something" }.string())); + CHECK_FALSE(is_yaml_file_name(fs::u8path{ "something-lock" }.string())); + CHECK_FALSE(is_yaml_file_name(fs::u8path{ "/some/dir/something" }.string())); + CHECK_FALSE(is_yaml_file_name(fs::u8path{ "../../some/dir/something" }.string())); } } @@ -133,11 +134,11 @@ namespace mamba { const auto test_dir_path = fs::temp_directory_path() / "libmamba" / "writable_tests"; fs::create_directories(test_dir_path); - on_scope_exit _{[&] - { - fs::permissions(test_dir_path, fs::perms::all); - fs::remove_all(test_dir_path); - }}; + on_scope_exit _{ [&] + { + fs::permissions(test_dir_path, fs::perms::all); + fs::remove_all(test_dir_path); + } }; CHECK(path::is_writable(test_dir_path)); fs::permissions(test_dir_path, fs::perms::none); @@ -157,7 +158,7 @@ namespace mamba const auto existing_file_path = test_dir_path / "existing-writable-test-delete-me.txt"; { - std::ofstream temp_file{existing_file_path.std_path()}; + std::ofstream temp_file{ existing_file_path.std_path() }; REQUIRE(temp_file.is_open()); temp_file << "delete me" << std::endl; } @@ -174,12 +175,11 @@ namespace mamba { TEST_CASE("proxy_match") { - Context::instance().proxy_servers = { - {"http", "foo"}, - {"https", "bar"}, - {"https://example.net", "foobar"}, - {"all://example.net", "baz"}, - {"all", "other"}}; + Context::instance().proxy_servers = { { "http", "foo" }, + { "https", "bar" }, + { "https://example.net", "foobar" }, + { "all://example.net", "baz" }, + { "all", "other" } }; CHECK_EQ(*proxy_match("http://example.com/channel"), "foo"); CHECK_EQ(*proxy_match("http://example.net/channel"), "foo"); @@ -189,11 +189,10 @@ namespace mamba CHECK_EQ(*proxy_match("ftp://example.net/channel"), "baz"); CHECK_EQ(*proxy_match("ftp://example.org"), "other"); - Context::instance().proxy_servers = { - {"http", "foo"}, - {"https", "bar"}, - {"https://example.net", "foobar"}, - {"all://example.net", "baz"}}; + Context::instance().proxy_servers = { { "http", "foo" }, + { "https", "bar" }, + { "https://example.net", "foobar" }, + { "all://example.net", "baz" } }; CHECK_FALSE(proxy_match("ftp://example.org").has_value()); diff --git a/libmamba/tests/src/core/test_util_string.cpp b/libmamba/tests/src/core/test_util_string.cpp index a55a884448..a02be67f00 100644 --- a/libmamba/tests/src/core/test_util_string.cpp +++ b/libmamba/tests/src/core/test_util_string.cpp @@ -67,24 +67,24 @@ namespace mamba TEST_CASE("any_starts_with") { using StrVec = std::vector; - CHECK_FALSE(any_starts_with(StrVec{}, {"not"})); + CHECK_FALSE(any_starts_with(StrVec{}, { "not" })); CHECK_FALSE(any_starts_with(StrVec{}, "")); - CHECK(any_starts_with(StrVec{":hello", "world"}, "")); - CHECK(any_starts_with(StrVec{":hello", "world"}, ":")); - CHECK(any_starts_with(StrVec{":hello", "world"}, ":h")); - CHECK(any_starts_with(StrVec{":hello", "world"}, ":hello")); - CHECK_FALSE(any_starts_with(StrVec{":hello", "world"}, "orld")); - CHECK(any_starts_with(StrVec{"áäᜩgþhëb", "®hüghœ©®xb"}, "áäá")); + CHECK(any_starts_with(StrVec{ ":hello", "world" }, "")); + CHECK(any_starts_with(StrVec{ ":hello", "world" }, ":")); + CHECK(any_starts_with(StrVec{ ":hello", "world" }, ":h")); + CHECK(any_starts_with(StrVec{ ":hello", "world" }, ":hello")); + CHECK_FALSE(any_starts_with(StrVec{ ":hello", "world" }, "orld")); + CHECK(any_starts_with(StrVec{ "áäᜩgþhëb", "®hüghœ©®xb" }, "áäá")); } TEST_CASE("starts_with_any") { using StrVec = std::vector; - CHECK(starts_with_any(":hello", StrVec{"", "not"})); - CHECK(starts_with_any(":hello", StrVec{":hello", "not"})); + CHECK(starts_with_any(":hello", StrVec{ "", "not" })); + CHECK(starts_with_any(":hello", StrVec{ ":hello", "not" })); CHECK_FALSE(starts_with_any(":hello", StrVec{})); - CHECK_FALSE(starts_with_any(":hello", StrVec{"not", "any"})); - CHECK(starts_with_any("áäᜩgþhëb®hüghœ©®xb", StrVec{"áäᜩgþhëb", "®hüghœ©®xb"})); + CHECK_FALSE(starts_with_any(":hello", StrVec{ "not", "any" })); + CHECK(starts_with_any("áäᜩgþhëb®hüghœ©®xb", StrVec{ "áäᜩgþhëb", "®hüghœ©®xb" })); } TEST_CASE("lstrip") @@ -101,12 +101,12 @@ namespace mamba TEST_CASE("lstrip_parts") { using StrPair = std::array; - CHECK_EQ(lstrip_parts(":::hello%:%", ":%"), StrPair({":::", "hello%:%"})); - CHECK_EQ(lstrip_parts(":::hello%:%", ':'), StrPair({":::", "hello%:%"})); - CHECK_EQ(lstrip_parts(":::hello%:%", '%'), StrPair({"", ":::hello%:%"})); - CHECK_EQ(lstrip_parts("", '%'), StrPair({"", ""})); - CHECK_EQ(lstrip_parts("aaa", 'a'), StrPair({"aaa", ""})); - CHECK_EQ(lstrip_parts("aaa", 'b'), StrPair({"", "aaa"})); + CHECK_EQ(lstrip_parts(":::hello%:%", ":%"), StrPair({ ":::", "hello%:%" })); + CHECK_EQ(lstrip_parts(":::hello%:%", ':'), StrPair({ ":::", "hello%:%" })); + CHECK_EQ(lstrip_parts(":::hello%:%", '%'), StrPair({ "", ":::hello%:%" })); + CHECK_EQ(lstrip_parts("", '%'), StrPair({ "", "" })); + CHECK_EQ(lstrip_parts("aaa", 'a'), StrPair({ "aaa", "" })); + CHECK_EQ(lstrip_parts("aaa", 'b'), StrPair({ "", "aaa" })); } TEST_CASE("lstrip_if") @@ -121,16 +121,16 @@ namespace mamba TEST_CASE("lstrip_if_parts") { using StrPair = std::array; - CHECK_EQ(lstrip_if_parts("", [](auto) { return true; }), StrPair({"", ""})); - CHECK_EQ(lstrip_if_parts("hello", [](auto) { return true; }), StrPair({"hello", ""})); - CHECK_EQ(lstrip_if_parts("hello", [](auto) { return false; }), StrPair({"", "hello"})); + CHECK_EQ(lstrip_if_parts("", [](auto) { return true; }), StrPair({ "", "" })); + CHECK_EQ(lstrip_if_parts("hello", [](auto) { return true; }), StrPair({ "hello", "" })); + CHECK_EQ(lstrip_if_parts("hello", [](auto) { return false; }), StrPair({ "", "hello" })); CHECK_EQ( lstrip_if_parts("\n \thello \t\n", [](auto c) { return !is_alphanum(c); }), - StrPair({"\n \t", "hello \t\n"}) + StrPair({ "\n \t", "hello \t\n" }) ); CHECK_EQ( lstrip_if_parts("123hello456", [](auto c) { return is_digit(c); }), - StrPair({"123", "hello456"}) + StrPair({ "123", "hello456" }) ); } @@ -148,12 +148,12 @@ namespace mamba TEST_CASE("rstrip_parts") { using StrPair = std::array; - CHECK_EQ(rstrip_parts(":::hello%:%", '%'), StrPair({":::hello%:", "%"})); - CHECK_EQ(rstrip_parts(":::hello%:%", ":%"), StrPair({":::hello", "%:%"})); - CHECK_EQ(rstrip_parts(":::hello%:%", ':'), StrPair({":::hello%:%", ""})); - CHECK_EQ(rstrip_parts("", '%'), StrPair({"", ""})); - CHECK_EQ(rstrip_parts("aaa", 'a'), StrPair({"", "aaa"})); - CHECK_EQ(rstrip_parts("aaa", 'b'), StrPair({"aaa", ""})); + CHECK_EQ(rstrip_parts(":::hello%:%", '%'), StrPair({ ":::hello%:", "%" })); + CHECK_EQ(rstrip_parts(":::hello%:%", ":%"), StrPair({ ":::hello", "%:%" })); + CHECK_EQ(rstrip_parts(":::hello%:%", ':'), StrPair({ ":::hello%:%", "" })); + CHECK_EQ(rstrip_parts("", '%'), StrPair({ "", "" })); + CHECK_EQ(rstrip_parts("aaa", 'a'), StrPair({ "", "aaa" })); + CHECK_EQ(rstrip_parts("aaa", 'b'), StrPair({ "aaa", "" })); } TEST_CASE("rstrip_if") @@ -168,16 +168,16 @@ namespace mamba TEST_CASE("rstrip_if_parts") { using StrPair = std::array; - CHECK_EQ(rstrip_if_parts("", [](auto) { return true; }), StrPair({"", ""})); - CHECK_EQ(rstrip_if_parts("hello", [](auto) { return true; }), StrPair({"", "hello"})); - CHECK_EQ(rstrip_if_parts("hello", [](auto) { return false; }), StrPair({"hello", ""})); + CHECK_EQ(rstrip_if_parts("", [](auto) { return true; }), StrPair({ "", "" })); + CHECK_EQ(rstrip_if_parts("hello", [](auto) { return true; }), StrPair({ "", "hello" })); + CHECK_EQ(rstrip_if_parts("hello", [](auto) { return false; }), StrPair({ "hello", "" })); CHECK_EQ( rstrip_if_parts("\n \thello \t\n", [](auto c) { return !is_alphanum(c); }), - StrPair({"\n \thello", " \t\n"}) + StrPair({ "\n \thello", " \t\n" }) ); CHECK_EQ( rstrip_if_parts("123hello456", [](auto c) { return is_digit(c); }), - StrPair({"123hello", "456"}) + StrPair({ "123hello", "456" }) ); } @@ -194,11 +194,11 @@ namespace mamba TEST_CASE("strip_parts") { using StrTrio = std::array; - CHECK_EQ(strip_parts(":::hello%:%", ":%"), StrTrio({":::", "hello", "%:%"})); - CHECK_EQ(strip_parts(":::hello%:%", ':'), StrTrio({":::", "hello%:%", ""})); - CHECK_EQ(strip_parts("", '%'), StrTrio({"", "", ""})); - CHECK_EQ(strip_parts("aaa", 'a'), StrTrio({"aaa", "", ""})); - CHECK_EQ(strip_parts("aaa", 'b'), StrTrio({"", "aaa", ""})); + CHECK_EQ(strip_parts(":::hello%:%", ":%"), StrTrio({ ":::", "hello", "%:%" })); + CHECK_EQ(strip_parts(":::hello%:%", ':'), StrTrio({ ":::", "hello%:%", "" })); + CHECK_EQ(strip_parts("", '%'), StrTrio({ "", "", "" })); + CHECK_EQ(strip_parts("aaa", 'a'), StrTrio({ "aaa", "", "" })); + CHECK_EQ(strip_parts("aaa", 'b'), StrTrio({ "", "aaa", "" })); } TEST_CASE("strip_if") @@ -213,16 +213,16 @@ namespace mamba TEST_CASE("strip_if_parts") { using StrTrio = std::array; - CHECK_EQ(strip_if_parts("", [](auto) { return true; }), StrTrio({"", "", ""})); - CHECK_EQ(strip_if_parts("hello", [](auto) { return true; }), StrTrio({"hello", "", ""})); - CHECK_EQ(strip_if_parts("hello", [](auto) { return false; }), StrTrio({"", "hello", ""})); + CHECK_EQ(strip_if_parts("", [](auto) { return true; }), StrTrio({ "", "", "" })); + CHECK_EQ(strip_if_parts("hello", [](auto) { return true; }), StrTrio({ "hello", "", "" })); + CHECK_EQ(strip_if_parts("hello", [](auto) { return false; }), StrTrio({ "", "hello", "" })); CHECK_EQ( strip_if_parts("\n \thello \t\n", [](auto c) { return !is_alphanum(c); }), - StrTrio({"\n \t", "hello", " \t\n"}) + StrTrio({ "\n \t", "hello", " \t\n" }) ); CHECK_EQ( strip_if_parts("123hello456", [](auto c) { return is_digit(c); }), - StrTrio({"123", "hello", "456"}) + StrTrio({ "123", "hello", "456" }) ); } @@ -289,32 +289,32 @@ namespace mamba TEST_CASE("split") { std::string a = "hello.again.it's.me.mario"; - std::vector e1 = {"hello", "again", "it's", "me", "mario"}; + std::vector e1 = { "hello", "again", "it's", "me", "mario" }; CHECK_EQ(split(a, "."), e1); - std::vector s2 = {"hello", "again", "it's.me.mario"}; + std::vector s2 = { "hello", "again", "it's.me.mario" }; CHECK_EQ(split(a, ".", 2), s2); CHECK_EQ(rsplit(a, "."), e1); - std::vector r2 = {"hello.again.it's", "me", "mario"}; + std::vector r2 = { "hello.again.it's", "me", "mario" }; CHECK_EQ(rsplit(a, ".", 2), r2); std::string b = "..."; - auto es1 = std::vector{"", "", "", ""}; - auto es2 = std::vector{"", ".."}; + auto es1 = std::vector{ "", "", "", "" }; + auto es2 = std::vector{ "", ".." }; CHECK_EQ(split(b, "."), es1); CHECK_EQ(split(b, ".", 1), es2); - std::vector v = {"xtensor==0.12.3"}; + std::vector v = { "xtensor==0.12.3" }; CHECK_EQ(split(v[0], ":"), v); CHECK_EQ(rsplit(v[0], ":"), v); CHECK_EQ(split(v[0], ":", 2), v); CHECK_EQ(rsplit(v[0], ":", 2), v); - std::vector v2 = {"conda-forge/linux64", "", "xtensor==0.12.3"}; + std::vector v2 = { "conda-forge/linux64", "", "xtensor==0.12.3" }; CHECK_EQ(split("conda-forge/linux64::xtensor==0.12.3", ":", 2), v2); CHECK_EQ(rsplit("conda-forge/linux64::xtensor==0.12.3", ":", 2), v2); - std::vector v21 = {"conda-forge/linux64:", "xtensor==0.12.3"}; + std::vector v21 = { "conda-forge/linux64:", "xtensor==0.12.3" }; CHECK_EQ(rsplit("conda-forge/linux64::xtensor==0.12.3", ":", 1), v21); } @@ -322,13 +322,13 @@ namespace mamba TEST_CASE("join") { { - std::vector to_join = {"a", "bc", "d"}; + std::vector to_join = { "a", "bc", "d" }; auto joined = join("-", to_join); static_assert(std::is_same::value); CHECK_EQ(joined, "a-bc-d"); } { - std::vector to_join = {"/a", "bc", "d"}; + std::vector to_join = { "/a", "bc", "d" }; auto joined = join("/", to_join); static_assert(std::is_same::value); CHECK_EQ(joined, "/a/bc/d"); @@ -340,16 +340,16 @@ namespace mamba TEST_CASE("join_trunc") { - std::vector to_join = {"a", "bc", "d", "e", "f"}; + std::vector to_join = { "a", "bc", "d", "e", "f" }; { auto joined = join_trunc(to_join); static_assert(std::is_same::value); } - CHECK_EQ(join_trunc(to_join, "-", "..", 5, {2, 1}), "a-bc-d-e-f"); - CHECK_EQ(join_trunc(to_join, ",", "..", 4, {2, 1}), "a,bc,..,f"); - CHECK_EQ(join_trunc(to_join, ",", "..", 4, {0, 1}), "..,f"); - CHECK_EQ(join_trunc(to_join, ",", "..", 4, {2, 0}), "a,bc,.."); - CHECK_EQ(join_trunc(to_join, ",", "..", 4, {0, 0}), ".."); + CHECK_EQ(join_trunc(to_join, "-", "..", 5, { 2, 1 }), "a-bc-d-e-f"); + CHECK_EQ(join_trunc(to_join, ",", "..", 4, { 2, 1 }), "a,bc,..,f"); + CHECK_EQ(join_trunc(to_join, ",", "..", 4, { 0, 1 }), "..,f"); + CHECK_EQ(join_trunc(to_join, ",", "..", 4, { 2, 0 }), "a,bc,.."); + CHECK_EQ(join_trunc(to_join, ",", "..", 4, { 0, 0 }), ".."); CHECK_EQ(join_trunc(std::vector()), ""); } diff --git a/libmamba/tests/src/core/test_validate.cpp b/libmamba/tests/src/core/test_validate.cpp index fbb73a29dc..d7b3cc362a 100644 --- a/libmamba/tests/src/core/test_validate.cpp +++ b/libmamba/tests/src/core/test_validate.cpp @@ -274,14 +274,14 @@ namespace mamba::validation void generate_secrets(int root = 1, int key_mgr = 1, int pkg_mgr = 1) { - secrets.insert({"root", generate_role_secrets(root)}); - secrets.insert({"key_mgr", generate_role_secrets(key_mgr)}); - secrets.insert({"pkg_mgr", generate_role_secrets(pkg_mgr)}); + secrets.insert({ "root", generate_role_secrets(root) }); + secrets.insert({ "key_mgr", generate_role_secrets(key_mgr) }); + secrets.insert({ "pkg_mgr", generate_role_secrets(pkg_mgr) }); } void sign_root() { - std::vector mandatory_roles({"root", "key_mgr"}); + std::vector mandatory_roles({ "root", "key_mgr" }); for (auto& r : mandatory_roles) { std::vector role_public_keys; @@ -289,7 +289,7 @@ namespace mamba::validation { role_public_keys.push_back(secret.first); } - root1_json["signed"]["delegations"][r] = RolePubKeys({role_public_keys, 1}); + root1_json["signed"]["delegations"][r] = RolePubKeys({ role_public_keys, 1 }); } root1_json["signed"]["version"] = 1; @@ -314,7 +314,7 @@ namespace mamba::validation sign(root_meta.dump(2), secret.second.data(), sig_bin); auto sig_hex = ::mamba::hex_string(sig_bin, MAMBA_ED25519_SIGSIZE_BYTES); - signatures[secret.first].insert({"signature", sig_hex}); + signatures[secret.first].insert({ "signature", sig_hex }); } return signatures; @@ -365,7 +365,7 @@ namespace mamba::validation generate_ed25519_keypair(pk, sk.data()); auto pk_hex = ::mamba::hex_string(pk, MAMBA_ED25519_KEYSIZE_BYTES); - role_secrets.insert({pk_hex, sk}); + role_secrets.insert({ pk_hex, sk }); } return role_secrets; } @@ -953,7 +953,7 @@ namespace mamba::validation { pkg_mgr_pks.push_back(secret.first); } - key_mgr_json["signed"]["delegations"]["pkg_mgr"] = RolePubKeys({pkg_mgr_pks, 1}); + key_mgr_json["signed"]["delegations"]["pkg_mgr"] = RolePubKeys({ pkg_mgr_pks, 1 }); key_mgr_json["signed"]["version"] = 1; key_mgr_json["signed"]["metadata_spec_version"] = "0.6.0"; @@ -1009,7 +1009,7 @@ namespace mamba::validation sign(meta.dump(2), secret.second.data(), sig_bin); auto sig_hex = ::mamba::hex_string(sig_bin, MAMBA_ED25519_SIGSIZE_BYTES); - signatures[secret.first].insert({"signature", sig_hex}); + signatures[secret.first].insert({ "signature", sig_hex }); } return signatures; @@ -1299,7 +1299,7 @@ namespace mamba::validation sign(meta.dump(2), secret.second.data(), sig_bin); auto sig_hex = ::mamba::hex_string(sig_bin, MAMBA_ED25519_SIGSIZE_BYTES); - signatures[secret.first].insert({"signature", sig_hex}); + signatures[secret.first].insert({ "signature", sig_hex }); } return signatures; @@ -1347,7 +1347,7 @@ namespace mamba::validation sign(meta.dump(2), secret.second.data(), sig_bin); auto sig_hex = ::mamba::hex_string(sig_bin, MAMBA_ED25519_SIGSIZE_BYTES); - signatures[secret.first].insert({"signature", sig_hex}); + signatures[secret.first].insert({ "signature", sig_hex }); } return signatures; @@ -1581,10 +1581,10 @@ namespace mamba::validation void generate_secrets(int root = 1, int targets = 1, int snapshot = 1, int timestamp = 1) { - secrets.insert({"root", generate_role_secrets(root)}); - secrets.insert({"targets", generate_role_secrets(targets)}); - secrets.insert({"snapshot", generate_role_secrets(snapshot)}); - secrets.insert({"timestamp", generate_role_secrets(timestamp)}); + secrets.insert({ "root", generate_role_secrets(root) }); + secrets.insert({ "targets", generate_role_secrets(targets) }); + secrets.insert({ "snapshot", generate_role_secrets(snapshot) }); + secrets.insert({ "timestamp", generate_role_secrets(timestamp) }); } void sign_root() @@ -1602,9 +1602,9 @@ namespace mamba::validation for (auto& s : it.second) { r_keys.push_back(s.first); - all_keys.insert({s.first, Key::from_ed25519(s.first)}); + all_keys.insert({ s.first, Key::from_ed25519(s.first) }); } - all_roles[r] = {r_keys, 1}; + all_roles[r] = { r_keys, 1 }; } root1_json.at("signed").at("roles") = all_roles; root1_json.at("signed").at("keys") = all_keys; @@ -1623,7 +1623,7 @@ namespace mamba::validation sign(root_meta.dump(), secret.second.data(), sig_bin); auto sig_hex = ::mamba::hex_string(sig_bin, MAMBA_ED25519_SIGSIZE_BYTES); - signatures.push_back({secret.first, sig_hex}); + signatures.push_back({ secret.first, sig_hex }); } return signatures; @@ -1651,7 +1651,7 @@ namespace mamba::validation generate_ed25519_keypair(pk, sk.data()); auto pk_hex = ::mamba::hex_string(pk, MAMBA_ED25519_KEYSIZE_BYTES); - role_secrets.insert({pk_hex, sk}); + role_secrets.insert({ pk_hex, sk }); } return role_secrets; } @@ -2156,11 +2156,11 @@ namespace mamba::validation // Test serialization/deserialization TEST_CASE("to_json") { - RoleSignature s{"some_key_id", "some_signature", ""}; + RoleSignature s{ "some_key_id", "some_signature", "" }; json j = R"({"keyid": "some_key_id", "sig": "some_signature"})"_json; CHECK_EQ(j, json(s)); - s = {"some_key_id", "some_signature", "some_pgp_trailer"}; + s = { "some_key_id", "some_signature", "some_pgp_trailer" }; j = R"({"keyid": "some_key_id", "other_headers": "some_pgp_trailer", "sig": "some_signature"})"_json; CHECK_EQ(j, json(s)); } diff --git a/libmamba/tests/src/core/test_virtual_packages.cpp b/libmamba/tests/src/core/test_virtual_packages.cpp index 3421454fbe..8cfc08387d 100644 --- a/libmamba/tests/src/core/test_virtual_packages.cpp +++ b/libmamba/tests/src/core/test_virtual_packages.cpp @@ -76,7 +76,7 @@ namespace mamba // This is bad design, tests should not interfer // Will get rid of that when implementing context as not a singleton auto restore_ctx = [&ctx, old_plat = ctx.platform]() { ctx.platform = old_plat; }; - auto finally = Finally{restore_ctx}; + auto finally = Finally{ restore_ctx }; ctx.platform = "osx-arm"; env::set("CONDA_OVERRIDE_OSX", "12.1"); diff --git a/libmamba/tests/src/doctest-printer/pair.hpp b/libmamba/tests/src/doctest-printer/pair.hpp index d39232af27..d0435291b4 100644 --- a/libmamba/tests/src/doctest-printer/pair.hpp +++ b/libmamba/tests/src/doctest-printer/pair.hpp @@ -16,7 +16,7 @@ namespace doctest { static auto convert(const std::pair& value) -> String { - return {fmt::format("std::pair{{{}, {}}}", value.first, value.second).c_str()}; + return { fmt::format("std::pair{{{}, {}}}", value.first, value.second).c_str() }; } }; } diff --git a/libmamba/tests/src/doctest-printer/vector.hpp b/libmamba/tests/src/doctest-printer/vector.hpp index f7fc2c19ed..0eb5cf0424 100644 --- a/libmamba/tests/src/doctest-printer/vector.hpp +++ b/libmamba/tests/src/doctest-printer/vector.hpp @@ -16,7 +16,7 @@ namespace doctest { static auto convert(const std::vector& value) -> String { - return {fmt::format("std::vector{{{}}}", fmt::join(value, ", ")).c_str()}; + return { fmt::format("std::vector{{{}}}", fmt::join(value, ", ")).c_str() }; } }; } diff --git a/libmamba/tests/src/solv-cpp/pool_data.hpp b/libmamba/tests/src/solv-cpp/pool_data.hpp index bea264a499..4055e66316 100644 --- a/libmamba/tests/src/solv-cpp/pool_data.hpp +++ b/libmamba/tests/src/solv-cpp/pool_data.hpp @@ -34,22 +34,22 @@ namespace mamba::test inline auto make_packages() { return std::array{ - SimplePkg{"menu", "1.5.0", {"dropdown=2.*"}}, - SimplePkg{"menu", "1.4.0", {"dropdown=2.*"}}, - SimplePkg{"menu", "1.3.0", {"dropdown=2.*"}}, - SimplePkg{"menu", "1.2.0", {"dropdown=2.*"}}, - SimplePkg{"menu", "1.1.0", {"dropdown=2.*"}}, - SimplePkg{"menu", "1.0.0", {"dropdown=1.*"}}, - SimplePkg{"dropdown", "2.3.0", {"icons=2.*"}}, - SimplePkg{"dropdown", "2.2.0", {"icons=2.*"}}, - SimplePkg{"dropdown", "2.1.0", {"icons=2.*"}}, - SimplePkg{"dropdown", "2.0.0", {"icons=2.*"}}, - SimplePkg{"dropdown", "1.8.0", {"icons=1.*", "intl=3.*"}}, - SimplePkg{"icons", "2.0.0"}, - SimplePkg{"icons", "1.0.0"}, - SimplePkg{"intl", "5.0.0"}, - SimplePkg{"intl", "4.0.0"}, - SimplePkg{"intl", "3.0.0"}, + SimplePkg{ "menu", "1.5.0", { "dropdown=2.*" } }, + SimplePkg{ "menu", "1.4.0", { "dropdown=2.*" } }, + SimplePkg{ "menu", "1.3.0", { "dropdown=2.*" } }, + SimplePkg{ "menu", "1.2.0", { "dropdown=2.*" } }, + SimplePkg{ "menu", "1.1.0", { "dropdown=2.*" } }, + SimplePkg{ "menu", "1.0.0", { "dropdown=1.*" } }, + SimplePkg{ "dropdown", "2.3.0", { "icons=2.*" } }, + SimplePkg{ "dropdown", "2.2.0", { "icons=2.*" } }, + SimplePkg{ "dropdown", "2.1.0", { "icons=2.*" } }, + SimplePkg{ "dropdown", "2.0.0", { "icons=2.*" } }, + SimplePkg{ "dropdown", "1.8.0", { "icons=1.*", "intl=3.*" } }, + SimplePkg{ "icons", "2.0.0" }, + SimplePkg{ "icons", "1.0.0" }, + SimplePkg{ "intl", "5.0.0" }, + SimplePkg{ "intl", "4.0.0" }, + SimplePkg{ "intl", "3.0.0" }, }; } diff --git a/libmamba/tests/src/solv-cpp/test_pool.cpp b/libmamba/tests/src/solv-cpp/test_pool.cpp index c75019c978..f409fa9dbf 100644 --- a/libmamba/tests/src/solv-cpp/test_pool.cpp +++ b/libmamba/tests/src/solv-cpp/test_pool.cpp @@ -113,7 +113,7 @@ TEST_SUITE("ObjPool") SUBCASE("Iterate over repos") { - const auto repo_ids = std::array{repo1_id, repo2_id, repo3_id}; + const auto repo_ids = std::array{ repo1_id, repo2_id, repo3_id }; SUBCASE("Over all repos") { @@ -187,7 +187,7 @@ TEST_SUITE("ObjPool") std::vector ids = {}; pool.for_each_solvable_id([&](SolvableId id) { ids.push_back(id); }); std::sort(ids.begin(), ids.end()); // Ease comparison - CHECK_EQ(ids, decltype(ids){id1, id2}); + CHECK_EQ(ids, decltype(ids){ id1, id2 }); pool.for_each_solvable( [&](ObjSolvableViewConst s) { CHECK_NE(std::find(ids.cbegin(), ids.cend(), s.id()), ids.cend()); } @@ -221,7 +221,7 @@ TEST_SUITE("ObjPool") std::vector ids = {}; pool.for_each_installed_solvable_id([&](auto id) { ids.push_back(id); }); std::sort(ids.begin(), ids.end()); // Ease comparsion - CHECK_EQ(ids, decltype(ids){id1}); + CHECK_EQ(ids, decltype(ids){ id1 }); } } @@ -246,7 +246,7 @@ TEST_SUITE("ObjPool") [&](auto id) { whatprovides_ids.push_back(id); } ); // Only one solvable matches - CHECK_EQ(whatprovides_ids, std::vector{id1}); + CHECK_EQ(whatprovides_ids, std::vector{ id1 }); } } } diff --git a/libmamba/tests/src/solv-cpp/test_queue.cpp b/libmamba/tests/src/solv-cpp/test_queue.cpp index 29ab868267..a5f2996f4a 100644 --- a/libmamba/tests/src/solv-cpp/test_queue.cpp +++ b/libmamba/tests/src/solv-cpp/test_queue.cpp @@ -23,7 +23,7 @@ TEST_SUITE("ObjQueue") CHECK_EQ(q1.size(), 0); CHECK(q1.empty()); - auto q2 = ObjQueue{1, 2, 3}; + auto q2 = ObjQueue{ 1, 2, 3 }; CHECK_EQ(q2.size(), 3); CHECK_FALSE(q2.empty()); @@ -50,7 +50,7 @@ TEST_SUITE("ObjQueue") const auto q1_data = q1.data(); const auto q1_size = q1.size(); - auto q2 = ObjQueue{1, 2, 3}; + auto q2 = ObjQueue{ 1, 2, 3 }; const auto q2_size = q2.size(); const auto q2_data = q2.data(); @@ -74,7 +74,7 @@ TEST_SUITE("ObjQueue") TEST_CASE("element") { - auto q = ObjQueue{3, 2, 1}; + auto q = ObjQueue{ 3, 2, 1 }; CHECK_EQ(q[0], 3); CHECK_EQ(q[1], 2); CHECK_EQ(q[2], 1); @@ -82,7 +82,7 @@ TEST_SUITE("ObjQueue") TEST_CASE("at") { - auto q = ObjQueue{3, 2, 1}; + auto q = ObjQueue{ 3, 2, 1 }; CHECK_EQ(q.at(0), q[0]); CHECK_EQ(q.at(1), q[1]); CHECK_EQ(q.at(2), q[2]); @@ -91,14 +91,14 @@ TEST_SUITE("ObjQueue") TEST_CASE("clear") { - auto q = ObjQueue{3, 2, 1}; + auto q = ObjQueue{ 3, 2, 1 }; q.clear(); CHECK(q.empty()); } TEST_CASE("iterator") { - const auto q = ObjQueue{3, 2, 1}; + const auto q = ObjQueue{ 3, 2, 1 }; std::size_t n = 0; for ([[maybe_unused]] auto _ : q) { @@ -107,13 +107,13 @@ TEST_SUITE("ObjQueue") CHECK_EQ(n, q.size()); const auto l = std::list<::Id>(q.begin(), q.end()); - const auto l_expected = std::list{3, 2, 1}; + const auto l_expected = std::list{ 3, 2, 1 }; CHECK_EQ(l, l_expected); } TEST_CASE("reverse_iterator") { - const auto q = ObjQueue{3, 2, 1}; + const auto q = ObjQueue{ 3, 2, 1 }; const auto v = std::vector(q.crbegin(), q.crend()); CHECK_EQ(v.front(), q.back()); @@ -132,7 +132,7 @@ TEST_SUITE("ObjQueue") { auto q = ObjQueue(); - const auto r1 = std::vector{1, 2, 3}; + const auto r1 = std::vector{ 1, 2, 3 }; // std::vector::iterator is not always a pointer auto iter = q.insert(q.cend(), r1.data(), r1.data() + r1.size()); CHECK_EQ(*iter, q[0]); @@ -140,7 +140,7 @@ TEST_SUITE("ObjQueue") CHECK_EQ(q[1], 2); CHECK_EQ(q[2], 3); - const auto r2 = std::vector{4, 4}; + const auto r2 = std::vector{ 4, 4 }; iter = q.insert(q.cbegin(), r2.data(), r2.data() + r2.size()); CHECK_EQ(*iter, q[0]); CHECK_EQ(q[0], 4); @@ -156,14 +156,14 @@ TEST_SUITE("ObjQueue") { auto q = ObjQueue(); - const auto r1 = std::list{1, 2, 3}; + const auto r1 = std::list{ 1, 2, 3 }; auto iter = q.insert(q.cend(), r1.begin(), r1.end()); CHECK_EQ(*iter, q[0]); CHECK_EQ(q[0], 1); CHECK_EQ(q[1], 2); CHECK_EQ(q[2], 3); - const auto r2 = std::list{4, 4}; + const auto r2 = std::list{ 4, 4 }; iter = q.insert(q.cbegin(), r2.begin(), r2.end()); CHECK_EQ(*iter, q[0]); CHECK_EQ(q[0], 4); @@ -177,7 +177,7 @@ TEST_SUITE("ObjQueue") TEST_CASE("erase") { - auto q = ObjQueue{3, 2, 1}; + auto q = ObjQueue{ 3, 2, 1 }; const auto iter = q.erase(q.cbegin() + 1); CHECK_EQ(*iter, 1); CHECK_EQ(q.size(), 2); @@ -195,7 +195,7 @@ TEST_SUITE("ObjQueue") { CHECK_EQ(ObjQueue{}, ObjQueue{}); - auto q1 = ObjQueue{1, 2, 3}; + auto q1 = ObjQueue{ 1, 2, 3 }; CHECK_EQ(q1, q1); CHECK_NE(q1, ObjQueue{}); @@ -208,7 +208,7 @@ TEST_SUITE("ObjQueue") TEST_CASE("contains") { - const auto q = ObjQueue{1, 9, 3}; + const auto q = ObjQueue{ 1, 9, 3 }; CHECK(q.contains(3)); CHECK_FALSE(q.contains(0)); } diff --git a/libmamba/tests/src/solv-cpp/test_repo.cpp b/libmamba/tests/src/solv-cpp/test_repo.cpp index 0fa6d612d6..8382cf6064 100644 --- a/libmamba/tests/src/solv-cpp/test_repo.cpp +++ b/libmamba/tests/src/solv-cpp/test_repo.cpp @@ -96,7 +96,7 @@ TEST_SUITE("ObjRepo") { SUBCASE("Over all solvables") { - const auto ids = std::array{id1, id2}; + const auto ids = std::array{ id1, id2 }; std::size_t n_solvables = 0; repo.for_each_solvable_id( [&](SolvableId id) diff --git a/libmamba/tests/src/solv-cpp/test_solvable.cpp b/libmamba/tests/src/solv-cpp/test_solvable.cpp index 9eda8be17e..2053c238c9 100644 --- a/libmamba/tests/src/solv-cpp/test_solvable.cpp +++ b/libmamba/tests/src/solv-cpp/test_solvable.cpp @@ -120,12 +120,12 @@ TEST_SUITE("ObjSolvable") SUBCASE("Add dependency") { solv.add_dependency(33); - CHECK_EQ(solv.dependencies(), ObjQueue{33}); + CHECK_EQ(solv.dependencies(), ObjQueue{ 33 }); SUBCASE("Add more dependencies") { - solv.add_dependencies(ObjQueue{44, 22}); - CHECK_EQ(solv.dependencies(), ObjQueue{33, 44, 22}); + solv.add_dependencies(ObjQueue{ 44, 22 }); + CHECK_EQ(solv.dependencies(), ObjQueue{ 33, 44, 22 }); } SUBCASE("Reset dependencies") @@ -140,17 +140,17 @@ TEST_SUITE("ObjSolvable") solv.add_dependency(11, SOLVABLE_PREREQMARKER); solv.add_dependency(35); - CHECK_EQ(solv.dependencies(-1), ObjQueue{33, 34}); - CHECK_EQ(solv.dependencies(0), ObjQueue{33, 34, SOLVABLE_PREREQMARKER, 11, 35}); - CHECK_EQ(solv.dependencies(1), ObjQueue{11, 35}); - CHECK_EQ(solv.dependencies(SOLVABLE_PREREQMARKER), ObjQueue{11, 35}); + CHECK_EQ(solv.dependencies(-1), ObjQueue{ 33, 34 }); + CHECK_EQ(solv.dependencies(0), ObjQueue{ 33, 34, SOLVABLE_PREREQMARKER, 11, 35 }); + CHECK_EQ(solv.dependencies(1), ObjQueue{ 11, 35 }); + CHECK_EQ(solv.dependencies(SOLVABLE_PREREQMARKER), ObjQueue{ 11, 35 }); } } SUBCASE("Add provide") { solv.add_provide(33); - CHECK_EQ(solv.provides(), ObjQueue{33}); + CHECK_EQ(solv.provides(), ObjQueue{ 33 }); SUBCASE("Add self provide") { @@ -160,8 +160,8 @@ TEST_SUITE("ObjSolvable") SUBCASE("Add more provides") { - solv.add_provides(ObjQueue{44, 22}); - CHECK_EQ(solv.provides(), ObjQueue{33, 44, 22}); + solv.add_provides(ObjQueue{ 44, 22 }); + CHECK_EQ(solv.provides(), ObjQueue{ 33, 44, 22 }); } SUBCASE("Reset provides") @@ -178,38 +178,38 @@ TEST_SUITE("ObjSolvable") SUBCASE("Internalize and get constraint") { repo.internalize(); - CHECK_EQ(solv.constraints(), ObjQueue{33}); + CHECK_EQ(solv.constraints(), ObjQueue{ 33 }); SUBCASE("Fail to add more constraint") { solv.add_constraint(44); - CHECK_EQ(solv.constraints(), ObjQueue{33}); + CHECK_EQ(solv.constraints(), ObjQueue{ 33 }); SUBCASE("Override when internalizing again") { repo.internalize(); - CHECK_EQ(solv.constraints(), ObjQueue{44}); + CHECK_EQ(solv.constraints(), ObjQueue{ 44 }); } } SUBCASE("Fail to set constraints") { - solv.set_constraints({22}); - CHECK_EQ(solv.constraints(), ObjQueue{33}); + solv.set_constraints({ 22 }); + CHECK_EQ(solv.constraints(), ObjQueue{ 33 }); SUBCASE("Override when internalizing again") { repo.internalize(); - CHECK_EQ(solv.constraints(), ObjQueue{22}); + CHECK_EQ(solv.constraints(), ObjQueue{ 22 }); } } } SUBCASE("Add more constraints") { - solv.add_constraints(ObjQueue{44, 22}); + solv.add_constraints(ObjQueue{ 44, 22 }); repo.internalize(); - CHECK_EQ(solv.constraints(), ObjQueue{33, 44, 22}); + CHECK_EQ(solv.constraints(), ObjQueue{ 33, 44, 22 }); } SUBCASE("Reset constraints") @@ -227,38 +227,38 @@ TEST_SUITE("ObjSolvable") SUBCASE("Internalize and get tracked features") { repo.internalize(); - CHECK_EQ(solv.track_features(), ObjQueue{feat1_id}); + CHECK_EQ(solv.track_features(), ObjQueue{ feat1_id }); SUBCASE("Fail to track more features") { const StringId feat2_id = solv.add_track_feature("feature2"); - CHECK_EQ(solv.track_features(), ObjQueue{feat1_id}); + CHECK_EQ(solv.track_features(), ObjQueue{ feat1_id }); SUBCASE("Override when internalizing again") { repo.internalize(); - CHECK_EQ(solv.track_features(), ObjQueue{feat2_id}); + CHECK_EQ(solv.track_features(), ObjQueue{ feat2_id }); } } SUBCASE("Fail to set tracked features") { - solv.set_track_features({22}); - CHECK_EQ(solv.track_features(), ObjQueue{feat1_id}); + solv.set_track_features({ 22 }); + CHECK_EQ(solv.track_features(), ObjQueue{ feat1_id }); SUBCASE("Override when internalizing again") { repo.internalize(); - CHECK_EQ(solv.track_features(), ObjQueue{22}); + CHECK_EQ(solv.track_features(), ObjQueue{ 22 }); } } } SUBCASE("Track more features") { - solv.add_track_features(ObjQueue{44, 11}); + solv.add_track_features(ObjQueue{ 44, 11 }); repo.internalize(); - CHECK_EQ(solv.track_features(), ObjQueue{feat1_id, 44, 11}); + CHECK_EQ(solv.track_features(), ObjQueue{ feat1_id, 44, 11 }); } SUBCASE("Reset tracked features") diff --git a/libmamba/tests/src/solv-cpp/test_transaction.cpp b/libmamba/tests/src/solv-cpp/test_transaction.cpp index 760a9e0c9a..cb492015fa 100644 --- a/libmamba/tests/src/solv-cpp/test_transaction.cpp +++ b/libmamba/tests/src/solv-cpp/test_transaction.cpp @@ -34,40 +34,40 @@ TEST_SUITE("ObjTransaction") SUBCASE("Add not installed package") { pool.create_whatprovides(); - const auto id = pkg_to_id.at({"menu", "1.5.0", {"dropdown=2.*"}}); - auto trans = ObjTransaction::from_solvables(pool, {id}); - CHECK_EQ(trans.steps(), ObjQueue{id}); + const auto id = pkg_to_id.at({ "menu", "1.5.0", { "dropdown=2.*" } }); + auto trans = ObjTransaction::from_solvables(pool, { id }); + CHECK_EQ(trans.steps(), ObjQueue{ id }); CHECK_EQ(trans.step_type(pool, id), SOLVER_TRANSACTION_INSTALL); } SUBCASE("Ignore removing not installed package") { pool.create_whatprovides(); - const auto id = pkg_to_id.at({"menu", "1.5.0", {"dropdown=2.*"}}); + const auto id = pkg_to_id.at({ "menu", "1.5.0", { "dropdown=2.*" } }); // Negative id means remove - auto trans = ObjTransaction::from_solvables(pool, {-id}); + auto trans = ObjTransaction::from_solvables(pool, { -id }); CHECK(trans.empty()); CHECK_EQ(trans.step_type(pool, id), SOLVER_TRANSACTION_IGNORE); } SUBCASE("Ignore adding installed package") { - const auto id = pkg_to_id.at({"menu", "1.5.0", {"dropdown=2.*"}}); + const auto id = pkg_to_id.at({ "menu", "1.5.0", { "dropdown=2.*" } }); pool.set_installed_repo(repo_id); pool.create_whatprovides(); - auto trans = ObjTransaction::from_solvables(pool, {id}); + auto trans = ObjTransaction::from_solvables(pool, { id }); CHECK(trans.empty()); CHECK_EQ(trans.step_type(pool, id), SOLVER_TRANSACTION_IGNORE); } SUBCASE("Remove installed package") { - const auto id = pkg_to_id.at({"menu", "1.5.0", {"dropdown=2.*"}}); + const auto id = pkg_to_id.at({ "menu", "1.5.0", { "dropdown=2.*" } }); pool.set_installed_repo(repo_id); pool.create_whatprovides(); // Negative id means remove - auto trans = ObjTransaction::from_solvables(pool, {-id}); - CHECK_EQ(trans.steps(), ObjQueue{id}); + auto trans = ObjTransaction::from_solvables(pool, { -id }); + CHECK_EQ(trans.steps(), ObjQueue{ id }); CHECK_EQ(trans.step_type(pool, id), SOLVER_TRANSACTION_ERASE); } } @@ -76,9 +76,9 @@ TEST_SUITE("ObjTransaction") { pool.create_whatprovides(); const auto solvables = ObjQueue{ - pkg_to_id.at({"menu", "1.5.0", {"dropdown=2.*"}}), - pkg_to_id.at({"dropdown", "2.3.0", {"icons=2.*"}}), - pkg_to_id.at({"icons", "2.0.0"}), + pkg_to_id.at({ "menu", "1.5.0", { "dropdown=2.*" } }), + pkg_to_id.at({ "dropdown", "2.3.0", { "icons=2.*" } }), + pkg_to_id.at({ "icons", "2.0.0" }), }; auto trans = ObjTransaction::from_solvables(pool, solvables); @@ -95,20 +95,20 @@ TEST_SUITE("ObjTransaction") SUBCASE("Order the solvables") { trans.order(pool); - CHECK_EQ(trans.steps(), ObjQueue{solvables.crbegin(), solvables.crend()}); + CHECK_EQ(trans.steps(), ObjQueue{ solvables.crbegin(), solvables.crend() }); } } SUBCASE("From a solver run") { auto [installed_id, installed] = pool.add_repo("installed"); - const auto icons_id = add_simple_package(pool, installed, {"icons", "1.0.0"}); + const auto icons_id = add_simple_package(pool, installed, { "icons", "1.0.0" }); installed.internalize(); pool.set_installed_repo(installed_id); pool.create_whatprovides(); auto solver = ObjSolver(pool); - REQUIRE(solver.solve(pool, {SOLVER_INSTALL, pool.add_conda_dependency("menu>=1.4")})); + REQUIRE(solver.solve(pool, { SOLVER_INSTALL, pool.add_conda_dependency("menu>=1.4") })); auto trans = ObjTransaction::from_solver(pool, solver); CHECK_FALSE(trans.empty()); CHECK_EQ(trans.size(), 4); @@ -122,7 +122,7 @@ TEST_SUITE("ObjTransaction") REQUIRE(maybe_icons_update_id.has_value()); CHECK(trans.steps().contains(maybe_icons_update_id.value())); // The solvable id that isupgraded by ``icons_id`` - CHECK_EQ(trans.step_olders(pool, maybe_icons_update_id.value()), ObjQueue{icons_id}); + CHECK_EQ(trans.step_olders(pool, maybe_icons_update_id.value()), ObjQueue{ icons_id }); } SUBCASE("Classify the transaction elements") diff --git a/libmamba/tests/src/specs/test_repo_data.cpp b/libmamba/tests/src/specs/test_repo_data.cpp index 983e756767..551f834c6c 100644 --- a/libmamba/tests/src/specs/test_repo_data.cpp +++ b/libmamba/tests/src/specs/test_repo_data.cpp @@ -47,7 +47,7 @@ TEST_SUITE("repo_data") j["build_number"] = 2; j["subdir"] = "folder"; j["platform"] = nullptr; - j["depends"] = nl::json::array({"libsolv>=1.0"}); + j["depends"] = nl::json::array({ "libsolv>=1.0" }); j["constrains"] = nl::json::array(); j["track_features"] = nl::json::array(); { @@ -60,7 +60,7 @@ TEST_SUITE("repo_data") CHECK_EQ(p.subdir, j.at("subdir")); CHECK_FALSE(p.md5.has_value()); CHECK_FALSE(p.platform.has_value()); - CHECK_EQ(p.depends, decltype(p.depends){"libsolv>=1.0"}); + CHECK_EQ(p.depends, decltype(p.depends){ "libsolv>=1.0" }); CHECK(p.constrains.empty()); CHECK(p.track_features.empty()); CHECK_FALSE(p.noarch.has_value()); @@ -87,12 +87,12 @@ TEST_SUITE("repo_data") { auto data = RepoData(); data.version = 1; - data.info = ChannelInfo{/* .subdir= */ "linux-64"}; + data.info = ChannelInfo{ /* .subdir= */ "linux-64" }; data.packages = { - {"mamba-1.0-h12345.tar.bz2", RepoDataPackage{"mamba"}}, - {"conda-1.0-h54321.tar.bz2", RepoDataPackage{"conda"}}, + { "mamba-1.0-h12345.tar.bz2", RepoDataPackage{ "mamba" } }, + { "conda-1.0-h54321.tar.bz2", RepoDataPackage{ "conda" } }, }; - data.removed = {"bad-package-1"}; + data.removed = { "bad-package-1" }; const nl::json j = data; CHECK_EQ(j.at("version"), data.version); @@ -105,7 +105,7 @@ TEST_SUITE("repo_data") j.at("packages").at("conda-1.0-h54321.tar.bz2"), data.packages.at("conda-1.0-h54321.tar.bz2") ); - CHECK_EQ(j.at("removed"), std::vector{"bad-package-1"}); + CHECK_EQ(j.at("removed"), std::vector{ "bad-package-1" }); } TEST_CASE("RepoData_from_json") @@ -118,7 +118,7 @@ TEST_SUITE("repo_data") j["packages"]["mamba-1.0-h12345.tar.bz2"]["build"] = "foo1"; j["packages"]["mamba-1.0-h12345.tar.bz2"]["build_number"] = 2; j["packages"]["mamba-1.0-h12345.tar.bz2"]["subdir"] = "folder"; - j["packages"]["mamba-1.0-h12345.tar.bz2"]["depends"] = nl::json::array({"libsolv>=1.0"}); + j["packages"]["mamba-1.0-h12345.tar.bz2"]["depends"] = nl::json::array({ "libsolv>=1.0" }); j["packages"]["mamba-1.0-h12345.tar.bz2"]["constrains"] = nl::json::array(); j["packages"]["mamba-1.0-h12345.tar.bz2"]["track_features"] = nl::json::array(); j["conda_packages"] = nl::json::object(); diff --git a/libmamba/tests/src/specs/test_version.cpp b/libmamba/tests/src/specs/test_version.cpp index 138aad2547..f882bcbc13 100644 --- a/libmamba/tests/src/specs/test_version.cpp +++ b/libmamba/tests/src/specs/test_version.cpp @@ -70,34 +70,34 @@ namespace mamba::specs TEST_CASE("version_comparison") { - auto v = Version(0, {{{1, "post"}}}); + auto v = Version(0, { { { 1, "post" } } }); REQUIRE_EQ(v.version().size(), 1); REQUIRE_EQ(v.version().front().size(), 1); REQUIRE_EQ(v.version().front().front(), VersionPartAtom(1, "post")); // Same empty 0!1post version - CHECK_EQ(Version(0, {{{1, "post"}}}), Version(0, {{{1, "post"}}})); + CHECK_EQ(Version(0, { { { 1, "post" } } }), Version(0, { { { 1, "post" } } })); // Empty trailing atom 0!1a == 0!1a0"" - CHECK_EQ(Version(0, {{{1, "a"}}}), Version(0, {{{1, "a"}, {}}})); + CHECK_EQ(Version(0, { { { 1, "a" } } }), Version(0, { { { 1, "a" }, {} } })); // Empty trailing part 0!1a == 0!1a.0"" - CHECK_EQ(Version(0, {{{1, "a"}}}), Version(0, {{{1, "a"}}, {{}}})); + CHECK_EQ(Version(0, { { { 1, "a" } } }), Version(0, { { { 1, "a" } }, { {} } })); // Mixed 0!1a0""0"" == 0!1a.0"" - CHECK_EQ(Version(0, {{{1, "a"}, {}, {}}}), Version(0, {{{1, "a"}}, {{}}})); + CHECK_EQ(Version(0, { { { 1, "a" }, {}, {} } }), Version(0, { { { 1, "a" } }, { {} } })); // Different epoch 0!2post < 1!1dev - CHECK_LT(Version(0, {{{2, "post"}}}), Version(1, {{{1, "dev"}}})); - CHECK_GE(Version(1, {{{1, "dev"}}}), Version(0, {{{2, "post"}}})); + CHECK_LT(Version(0, { { { 2, "post" } } }), Version(1, { { { 1, "dev" } } })); + CHECK_GE(Version(1, { { { 1, "dev" } } }), Version(0, { { { 2, "post" } } })); // Different lenght with dev - CHECK_LT(Version(0, {{{1}}, {{0, "dev"}}}), Version(0, {{{1}}})); - CHECK_LT(Version(0, {{{1}}, {{0}}, {{0, "dev"}}}), Version(0, {{{1}}})); + CHECK_LT(Version(0, { { { 1 } }, { { 0, "dev" } } }), Version(0, { { { 1 } } })); + CHECK_LT(Version(0, { { { 1 } }, { { 0 } }, { { 0, "dev" } } }), Version(0, { { { 1 } } })); // Different major 0!1post < 0!2dev - CHECK_LT(Version(0, {{{1, "post"}}}), Version(0, {{{2, "dev"}}})); + CHECK_LT(Version(0, { { { 1, "post" } } }), Version(0, { { { 2, "dev" } } })); // Different length 0!2"".0"" < 0!11"".0"".0post all operator - CHECK_NE(Version(0, {{{2}, {0}}}), Version(0, {{{11}, {0}, {0, "post"}}})); - CHECK_LT(Version(0, {{{2}, {0}}}), Version(0, {{{11}, {0}, {0, "post"}}})); - CHECK_LE(Version(0, {{{2}, {0}}}), Version(0, {{{11}, {0}, {0, "post"}}})); - CHECK_GT(Version(0, {{{11}, {0}, {0, "post"}}}), Version(0, {{{2}, {0}}})); - CHECK_GE(Version(0, {{{11}, {0}, {0, "post"}}}), Version(0, {{{2}, {0}}})); + CHECK_NE(Version(0, { { { 2 }, { 0 } } }), Version(0, { { { 11 }, { 0 }, { 0, "post" } } })); + CHECK_LT(Version(0, { { { 2 }, { 0 } } }), Version(0, { { { 11 }, { 0 }, { 0, "post" } } })); + CHECK_LE(Version(0, { { { 2 }, { 0 } } }), Version(0, { { { 11 }, { 0 }, { 0, "post" } } })); + CHECK_GT(Version(0, { { { 11 }, { 0 }, { 0, "post" } } }), Version(0, { { { 2 }, { 0 } } })); + CHECK_GE(Version(0, { { { 11 }, { 0 }, { 0, "post" } } }), Version(0, { { { 2 }, { 0 } } })); } TEST_CASE("version_format") diff --git a/libmamba/tests/src/util/test_compare.cpp b/libmamba/tests/src/util/test_compare.cpp index 2f416cd16a..badf56fcfd 100644 --- a/libmamba/tests/src/util/test_compare.cpp +++ b/libmamba/tests/src/util/test_compare.cpp @@ -18,72 +18,72 @@ TEST_SUITE("compare") { TEST_CASE("equal") { - CHECK(cmp_equal(char{0}, char{0})); - CHECK(cmp_equal(char{1}, char{1})); - CHECK(cmp_equal(char{-1}, char{-1})); - CHECK(cmp_equal(int{0}, int{0})); - CHECK(cmp_equal(int{1}, int{1})); - CHECK(cmp_equal(int{-1}, int{-1})); - CHECK(cmp_equal(std::size_t{0}, std::size_t{0})); - CHECK(cmp_equal(std::size_t{1}, std::size_t{1})); + CHECK(cmp_equal(char{ 0 }, char{ 0 })); + CHECK(cmp_equal(char{ 1 }, char{ 1 })); + CHECK(cmp_equal(char{ -1 }, char{ -1 })); + CHECK(cmp_equal(int{ 0 }, int{ 0 })); + CHECK(cmp_equal(int{ 1 }, int{ 1 })); + CHECK(cmp_equal(int{ -1 }, int{ -1 })); + CHECK(cmp_equal(std::size_t{ 0 }, std::size_t{ 0 })); + CHECK(cmp_equal(std::size_t{ 1 }, std::size_t{ 1 })); - CHECK(cmp_equal(char{0}, int{0})); - CHECK(cmp_equal(char{1}, int{1})); - CHECK(cmp_equal(char{-1}, int{-1})); - CHECK(cmp_equal(std::size_t{0}, char{0})); - CHECK(cmp_equal(std::size_t{1}, char{1})); - CHECK(cmp_equal(std::size_t{0}, int{0})); - CHECK(cmp_equal(std::size_t{1}, int{1})); + CHECK(cmp_equal(char{ 0 }, int{ 0 })); + CHECK(cmp_equal(char{ 1 }, int{ 1 })); + CHECK(cmp_equal(char{ -1 }, int{ -1 })); + CHECK(cmp_equal(std::size_t{ 0 }, char{ 0 })); + CHECK(cmp_equal(std::size_t{ 1 }, char{ 1 })); + CHECK(cmp_equal(std::size_t{ 0 }, int{ 0 })); + CHECK(cmp_equal(std::size_t{ 1 }, int{ 1 })); - CHECK_FALSE(cmp_equal(char{0}, char{1})); - CHECK_FALSE(cmp_equal(char{1}, char{-1})); - CHECK_FALSE(cmp_equal(int{0}, int{1})); - CHECK_FALSE(cmp_equal(int{-1}, int{1})); - CHECK_FALSE(cmp_equal(std::size_t{0}, std::size_t{1})); + CHECK_FALSE(cmp_equal(char{ 0 }, char{ 1 })); + CHECK_FALSE(cmp_equal(char{ 1 }, char{ -1 })); + CHECK_FALSE(cmp_equal(int{ 0 }, int{ 1 })); + CHECK_FALSE(cmp_equal(int{ -1 }, int{ 1 })); + CHECK_FALSE(cmp_equal(std::size_t{ 0 }, std::size_t{ 1 })); - CHECK_FALSE(cmp_equal(char{0}, int{1})); - CHECK_FALSE(cmp_equal(char{1}, int{-1})); - CHECK_FALSE(cmp_equal(char{-1}, int{1})); - CHECK_FALSE(cmp_equal(std::size_t{1}, int{-1})); - CHECK_FALSE(cmp_equal(static_cast(-1), int{-1})); - CHECK_FALSE(cmp_equal(std::size_t{1}, int{0})); - CHECK_FALSE(cmp_equal(std::numeric_limits::max(), int{0})); + CHECK_FALSE(cmp_equal(char{ 0 }, int{ 1 })); + CHECK_FALSE(cmp_equal(char{ 1 }, int{ -1 })); + CHECK_FALSE(cmp_equal(char{ -1 }, int{ 1 })); + CHECK_FALSE(cmp_equal(std::size_t{ 1 }, int{ -1 })); + CHECK_FALSE(cmp_equal(static_cast(-1), int{ -1 })); + CHECK_FALSE(cmp_equal(std::size_t{ 1 }, int{ 0 })); + CHECK_FALSE(cmp_equal(std::numeric_limits::max(), int{ 0 })); } TEST_CASE("less") { - CHECK(cmp_less(char{0}, char{1})); - CHECK(cmp_less(char{-1}, char{0})); - CHECK(cmp_less(int{0}, int{1})); - CHECK(cmp_less(int{-1}, int{1})); - CHECK(cmp_less(std::size_t{0}, std::size_t{1})); + CHECK(cmp_less(char{ 0 }, char{ 1 })); + CHECK(cmp_less(char{ -1 }, char{ 0 })); + CHECK(cmp_less(int{ 0 }, int{ 1 })); + CHECK(cmp_less(int{ -1 }, int{ 1 })); + CHECK(cmp_less(std::size_t{ 0 }, std::size_t{ 1 })); - CHECK(cmp_less(char{0}, int{1})); - CHECK(cmp_less(char{-1}, int{0})); - CHECK(cmp_less(char{-1}, int{1})); - CHECK(cmp_less(char{-1}, std::size_t{1})); - CHECK(cmp_less(std::size_t{0}, int{1})); - CHECK(cmp_less(std::numeric_limits::min(), char{0})); - CHECK(cmp_less(std::numeric_limits::min(), std::size_t{0})); - CHECK(cmp_less(int{-1}, std::numeric_limits::max())); - CHECK(cmp_less(std::size_t{1}, std::numeric_limits::max())); + CHECK(cmp_less(char{ 0 }, int{ 1 })); + CHECK(cmp_less(char{ -1 }, int{ 0 })); + CHECK(cmp_less(char{ -1 }, int{ 1 })); + CHECK(cmp_less(char{ -1 }, std::size_t{ 1 })); + CHECK(cmp_less(std::size_t{ 0 }, int{ 1 })); + CHECK(cmp_less(std::numeric_limits::min(), char{ 0 })); + CHECK(cmp_less(std::numeric_limits::min(), std::size_t{ 0 })); + CHECK(cmp_less(int{ -1 }, std::numeric_limits::max())); + CHECK(cmp_less(std::size_t{ 1 }, std::numeric_limits::max())); - CHECK_FALSE(cmp_less(char{1}, char{0})); - CHECK_FALSE(cmp_less(char{1}, char{1})); - CHECK_FALSE(cmp_less(char{0}, char{-1})); - CHECK_FALSE(cmp_less(int{1}, int{0})); - CHECK_FALSE(cmp_less(int{1}, int{-1})); - CHECK_FALSE(cmp_less(std::size_t{1}, std::size_t{0})); + CHECK_FALSE(cmp_less(char{ 1 }, char{ 0 })); + CHECK_FALSE(cmp_less(char{ 1 }, char{ 1 })); + CHECK_FALSE(cmp_less(char{ 0 }, char{ -1 })); + CHECK_FALSE(cmp_less(int{ 1 }, int{ 0 })); + CHECK_FALSE(cmp_less(int{ 1 }, int{ -1 })); + CHECK_FALSE(cmp_less(std::size_t{ 1 }, std::size_t{ 0 })); - CHECK_FALSE(cmp_less(char{1}, int{1})); - CHECK_FALSE(cmp_less(char{1}, int{0})); - CHECK_FALSE(cmp_less(char{0}, int{-1})); - CHECK_FALSE(cmp_less(char{1}, int{-11})); - CHECK_FALSE(cmp_less(std::size_t{1}, char{-1})); - CHECK_FALSE(cmp_less(int{1}, std::size_t{0})); - CHECK_FALSE(cmp_less(char{0}, std::numeric_limits::min())); - CHECK_FALSE(cmp_less(std::size_t{0}, std::numeric_limits::min())); - CHECK_FALSE(cmp_less(std::numeric_limits::max(), int{-1})); - CHECK_FALSE(cmp_less(std::numeric_limits::max(), std::size_t{1})); + CHECK_FALSE(cmp_less(char{ 1 }, int{ 1 })); + CHECK_FALSE(cmp_less(char{ 1 }, int{ 0 })); + CHECK_FALSE(cmp_less(char{ 0 }, int{ -1 })); + CHECK_FALSE(cmp_less(char{ 1 }, int{ -11 })); + CHECK_FALSE(cmp_less(std::size_t{ 1 }, char{ -1 })); + CHECK_FALSE(cmp_less(int{ 1 }, std::size_t{ 0 })); + CHECK_FALSE(cmp_less(char{ 0 }, std::numeric_limits::min())); + CHECK_FALSE(cmp_less(std::size_t{ 0 }, std::numeric_limits::min())); + CHECK_FALSE(cmp_less(std::numeric_limits::max(), int{ -1 })); + CHECK_FALSE(cmp_less(std::numeric_limits::max(), std::size_t{ 1 })); } } diff --git a/libmamba/tests/src/util/test_flat_set.cpp b/libmamba/tests/src/util/test_flat_set.cpp index 198ab903c8..f5cc03ecfb 100644 --- a/libmamba/tests/src/util/test_flat_set.cpp +++ b/libmamba/tests/src/util/test_flat_set.cpp @@ -18,14 +18,14 @@ TEST_SUITE("flat_set") { const auto s1 = flat_set(); CHECK_EQ(s1.size(), 0); - auto s2 = flat_set({1, 2}); + auto s2 = flat_set({ 1, 2 }); CHECK_EQ(s2.size(), 2); - const auto s3 = flat_set{s2}; + const auto s3 = flat_set{ s2 }; CHECK_EQ(s3.size(), 2); - const auto s4 = flat_set{std::move(s2)}; + const auto s4 = flat_set{ std::move(s2) }; CHECK_EQ(s4.size(), 2); // CTAD - auto s5 = flat_set({1, 2}); + auto s5 = flat_set({ 1, 2 }); CHECK_EQ(s5.size(), 2); static_assert(std::is_same_v); auto s6 = flat_set(s5.begin(), s5.end(), std::greater{}); @@ -37,46 +37,46 @@ TEST_SUITE("flat_set") TEST_CASE("equality") { CHECK_EQ(flat_set(), flat_set()); - CHECK_EQ(flat_set({1, 2}), flat_set({1, 2})); - CHECK_EQ(flat_set({1, 2}), flat_set({2, 1})); - CHECK_EQ(flat_set({1, 2, 1}), flat_set({2, 2, 1})); - CHECK_NE(flat_set({1, 2}), flat_set({1, 2, 3})); - CHECK_NE(flat_set({2}), flat_set({})); + CHECK_EQ(flat_set({ 1, 2 }), flat_set({ 1, 2 })); + CHECK_EQ(flat_set({ 1, 2 }), flat_set({ 2, 1 })); + CHECK_EQ(flat_set({ 1, 2, 1 }), flat_set({ 2, 2, 1 })); + CHECK_NE(flat_set({ 1, 2 }), flat_set({ 1, 2, 3 })); + CHECK_NE(flat_set({ 2 }), flat_set({})); } TEST_CASE("insert") { auto s = flat_set(); s.insert(33); - CHECK_EQ(s, flat_set({33})); + CHECK_EQ(s, flat_set({ 33 })); s.insert(33); s.insert(17); - CHECK_EQ(s, flat_set({17, 33})); + CHECK_EQ(s, flat_set({ 17, 33 })); s.insert(22); - CHECK_EQ(s, flat_set({17, 22, 33})); + CHECK_EQ(s, flat_set({ 17, 22, 33 })); s.insert(33); - CHECK_EQ(s, flat_set({17, 22, 33})); - auto v = std::vector({33, 22, 17, 0}); + CHECK_EQ(s, flat_set({ 17, 22, 33 })); + auto v = std::vector({ 33, 22, 17, 0 }); s.insert(v.begin(), v.end()); - CHECK_EQ(s, flat_set({0, 17, 22, 33})); + CHECK_EQ(s, flat_set({ 0, 17, 22, 33 })); } TEST_CASE("erase") { - auto s = flat_set{4, 3, 2, 1}; + auto s = flat_set{ 4, 3, 2, 1 }; CHECK_EQ(s.erase(4), 1); - CHECK_EQ(s, flat_set({1, 2, 3})); + CHECK_EQ(s, flat_set({ 1, 2, 3 })); CHECK_EQ(s.erase(4), 0); - CHECK_EQ(s, flat_set({1, 2, 3})); + CHECK_EQ(s, flat_set({ 1, 2, 3 })); const auto it = s.erase(s.begin()); CHECK_EQ(it, s.begin()); - CHECK_EQ(s, flat_set({2, 3})); + CHECK_EQ(s, flat_set({ 2, 3 })); } TEST_CASE("contains") { - const auto s = flat_set({1, 3, 4, 5}); + const auto s = flat_set({ 1, 3, 4, 5 }); CHECK_FALSE(s.contains(0)); CHECK(s.contains(1)); CHECK_FALSE(s.contains(2)); @@ -88,7 +88,7 @@ TEST_SUITE("flat_set") TEST_CASE("key_compare") { - auto s = flat_set({1, 3, 4, 5}, std::greater{}); + auto s = flat_set({ 1, 3, 4, 5 }, std::greater{}); CHECK_EQ(s.front(), 5); CHECK_EQ(s.back(), 1); s.insert(6); diff --git a/libmamba/tests/src/util/test_graph.cpp b/libmamba/tests/src/util/test_graph.cpp index 938b568154..d14ce379ba 100644 --- a/libmamba/tests/src/util/test_graph.cpp +++ b/libmamba/tests/src/util/test_graph.cpp @@ -143,16 +143,18 @@ TEST_SUITE("graph") CHECK_EQ(g.number_of_edges(), 7ul); CHECK_EQ( g.nodes(), - node_map({{0, 0.5}, {1, 1.5}, {2, 2.5}, {3, 3.5}, {4, 4.5}, {5, 5.5}, {6, 6.5}}) + node_map( + { { 0, 0.5 }, { 1, 1.5 }, { 2, 2.5 }, { 3, 3.5 }, { 4, 4.5 }, { 5, 5.5 }, { 6, 6.5 } } + ) ); - CHECK_EQ(g.successors(0u), node_id_list({1u, 2u})); - CHECK_EQ(g.successors(1u), node_id_list({3u, 4u})); - CHECK_EQ(g.successors(2u), node_id_list({3u, 5u})); - CHECK_EQ(g.successors(3u), node_id_list({6u})); + CHECK_EQ(g.successors(0u), node_id_list({ 1u, 2u })); + CHECK_EQ(g.successors(1u), node_id_list({ 3u, 4u })); + CHECK_EQ(g.successors(2u), node_id_list({ 3u, 5u })); + CHECK_EQ(g.successors(3u), node_id_list({ 6u })); CHECK_EQ(g.predecessors(0u), node_id_list()); - CHECK_EQ(g.predecessors(1u), node_id_list({0u})); - CHECK_EQ(g.predecessors(2u), node_id_list({0u})); - CHECK_EQ(g.predecessors(3u), node_id_list({1u, 2u})); + CHECK_EQ(g.predecessors(1u), node_id_list({ 0u })); + CHECK_EQ(g.predecessors(2u), node_id_list({ 0u })); + CHECK_EQ(g.predecessors(3u), node_id_list({ 1u, 2u })); } TEST_CASE("build_edge_data") @@ -162,16 +164,16 @@ TEST_SUITE("graph") using node_id_list = decltype(g)::node_id_list; CHECK_EQ(g.number_of_nodes(), 3ul); CHECK_EQ(g.number_of_edges(), 2ul); - CHECK_EQ(g.nodes(), node_map({{0, 0.5}, {1, 1.5}, {2, 2.5}})); - CHECK_EQ(g.successors(0ul), node_id_list({1ul})); - CHECK_EQ(g.successors(1ul), node_id_list({2ul})); + CHECK_EQ(g.nodes(), node_map({ { 0, 0.5 }, { 1, 1.5 }, { 2, 2.5 } })); + CHECK_EQ(g.successors(0ul), node_id_list({ 1ul })); + CHECK_EQ(g.successors(1ul), node_id_list({ 2ul })); CHECK_EQ(g.successors(2ul), node_id_list()); CHECK_EQ(g.predecessors(0ul), node_id_list()); - CHECK_EQ(g.predecessors(1ul), node_id_list({0ul})); - CHECK_EQ(g.predecessors(2ul), node_id_list({1ul})); + CHECK_EQ(g.predecessors(1ul), node_id_list({ 0ul })); + CHECK_EQ(g.predecessors(2ul), node_id_list({ 1ul })); using edge_map = decltype(g)::edge_map; - CHECK_EQ(g.edges(), edge_map({{{0ul, 1ul}, "n0->n1"}, {{1ul, 2ul}, "n1->n2"}})); + CHECK_EQ(g.edges(), edge_map({ { { 0ul, 1ul }, "n0->n1" }, { { 1ul, 2ul }, "n1->n2" } })); } TEST_CASE("has_node_edge") @@ -219,7 +221,7 @@ TEST_SUITE("graph") CHECK(g.remove_edge(0, 1)); CHECK_EQ(g.number_of_edges(), n_edges_init - 1u); CHECK_FALSE(g.has_edge(0, 1)); - CHECK_EQ(g.edges().count({0, 1}), 0); + CHECK_EQ(g.edges().count({ 0, 1 }), 0); } TEST_CASE("remove_node") @@ -308,7 +310,7 @@ TEST_SUITE("graph") using node_id_list = decltype(g)::node_id_list; auto leaves = node_id_list(); g.for_each_leaf_id([&leaves](node_id leaf) { leaves.insert(leaf); }); - CHECK_EQ(leaves, node_id_list({4ul, 5ul, 6ul})); + CHECK_EQ(leaves, node_id_list({ 4ul, 5ul, 6ul })); } TEST_CASE("for_each_leaf_from") @@ -318,7 +320,7 @@ TEST_SUITE("graph") using node_id_list = decltype(g)::node_id_list; auto leaves = node_id_list(); g.for_each_leaf_id_from(2ul, [&leaves](node_id leaf) { leaves.insert(leaf); }); - CHECK_EQ(leaves, node_id_list({5ul, 6ul})); + CHECK_EQ(leaves, node_id_list({ 5ul, 6ul })); } TEST_CASE("for_each_root") @@ -328,7 +330,7 @@ TEST_SUITE("graph") using node_id_list = decltype(g)::node_id_list; auto roots = node_id_list(); g.for_each_root_id([&roots](node_id root) { roots.insert(root); }); - CHECK_EQ(roots, node_id_list({0ul})); + CHECK_EQ(roots, node_id_list({ 0ul })); } TEST_CASE("for_each_root_from") @@ -338,7 +340,7 @@ TEST_SUITE("graph") using node_id_list = decltype(g)::node_id_list; auto leaves = node_id_list(); g.for_each_root_id_from(2ul, [&leaves](node_id leaf) { leaves.insert(leaf); }); - CHECK_EQ(leaves, node_id_list({0ul})); + CHECK_EQ(leaves, node_id_list({ 0ul })); } TEST_CASE("depth_first_search") @@ -432,7 +434,7 @@ TEST_SUITE("graph") [&nodes](node_id n) { nodes.push_back(n); }, n0 ); - CHECK_EQ(nodes, std::vector{n0, n1}); + CHECK_EQ(nodes, std::vector{ n0, n1 }); } SUBCASE("dfs_preorder on all nodes") @@ -442,7 +444,7 @@ TEST_SUITE("graph") REQUIRE(g.has_node(n2)); dfs_preorder_nodes_for_each_id(g, [&nodes](node_id n) { nodes.push_back(n); }); CHECK(is_node_id_permutation(g, nodes.cbegin(), nodes.cend())); - CHECK_EQ(nodes, std::vector{n0, n1, n2}); + CHECK_EQ(nodes, std::vector{ n0, n1, n2 }); } SUBCASE("dfs_postorder starting on a given node") @@ -452,14 +454,14 @@ TEST_SUITE("graph") [&nodes](node_id n) { nodes.push_back(n); }, n0 ); - CHECK_EQ(nodes, std::vector{n1, n0}); + CHECK_EQ(nodes, std::vector{ n1, n0 }); } SUBCASE("dfs_postorder on all nodes") { dfs_postorder_nodes_for_each_id(g, [&nodes](node_id n) { nodes.push_back(n); }); CHECK(is_node_id_permutation(g, nodes.cbegin(), nodes.cend())); - CHECK_EQ(nodes, std::vector{n1, n0, n2}); + CHECK_EQ(nodes, std::vector{ n1, n0, n2 }); } } diff --git a/libmamba/tests/src/util/test_iterator.cpp b/libmamba/tests/src/util/test_iterator.cpp index da26cecbd4..5f6ef3eb8a 100644 --- a/libmamba/tests/src/util/test_iterator.cpp +++ b/libmamba/tests/src/util/test_iterator.cpp @@ -35,12 +35,12 @@ namespace struct filter_test_data { filter_test_data() - : input_forward_sequence({1, 12, 2, 3, 14, 4, 18, 20, 4}) - , res_forward_sequence({12, 14, 18, 20}) - , input_bidirectional_sequence({1, 12, 2, 3, 14, 4, 18, 20, 4}) - , res_bidirectional_sequence({12, 14, 18, 20}) - , input_random_sequence({1, 12, 2, 3, 14, 4, 18, 20, 4}) - , res_random_sequence({12, 14, 18, 20}) + : input_forward_sequence({ 1, 12, 2, 3, 14, 4, 18, 20, 4 }) + , res_forward_sequence({ 12, 14, 18, 20 }) + , input_bidirectional_sequence({ 1, 12, 2, 3, 14, 4, 18, 20, 4 }) + , res_bidirectional_sequence({ 12, 14, 18, 20 }) + , input_random_sequence({ 1, 12, 2, 3, 14, 4, 18, 20, 4 }) + , res_random_sequence({ 12, 14, 18, 20 }) { } diff --git a/libmambapy/libmambapy/__init__.pyi b/libmambapy/libmambapy/__init__.pyi index 648982ddb9..234b8e0b79 100644 --- a/libmambapy/libmambapy/__init__.pyi +++ b/libmambapy/libmambapy/__init__.pyi @@ -1533,8 +1533,6 @@ class SubdirData: ) -> None: ... def cache_path(self) -> str: ... def create_repo(self, arg0: Pool) -> Repo: ... - def download_and_check_targets(self, arg0: DownloadTargetList) -> bool: ... - def finalize_checks(self) -> None: ... def loaded(self) -> bool: ... pass diff --git a/libmambapy/src/main.cpp b/libmambapy/src/main.cpp index bf287f61e0..fc066a7c63 100644 --- a/libmambapy/src/main.cpp +++ b/libmambapy/src/main.cpp @@ -136,7 +136,6 @@ PYBIND11_MODULE(bindings, m) auto pyPackageInfo = py::class_(m, "PackageInfo"); auto pyPrefixData = py::class_(m, "PrefixData"); auto pySolver = py::class_(m, "Solver"); - auto pyMultiDownloadTarget = py::class_(m, "DownloadTargetList"); // only used in a return type; does it belong in the module? auto pyRootRole = py::class_(m, "RootRole"); @@ -160,13 +159,13 @@ PYBIND11_MODULE(bindings, m) .def(py::init<>()) .def(py::init<>( [](const std::string& name) { - return MatchSpec{name, mambapy::singletons().channel_context}; + return MatchSpec{ name, mambapy::singletons().channel_context }; } )) .def("conda_build_form", &MatchSpec::conda_build_form); py::class_(m, "Pool") - .def(py::init<>([] { return MPool{mambapy::singletons().channel_context}; })) + .def(py::init<>([] { return MPool{ mambapy::singletons().channel_context }; })) .def("set_debuglevel", &MPool::set_debuglevel) .def("create_whatprovides", &MPool::create_whatprovides) .def("select_solvables", &MPool::select_solvables, py::arg("id"), py::arg("sorted") = false) @@ -174,7 +173,7 @@ PYBIND11_MODULE(bindings, m) .def( "matchspec2id", [](MPool& self, std::string_view ms) { - return self.matchspec2id({ms, mambapy::singletons().channel_context}); + return self.matchspec2id({ ms, mambapy::singletons().channel_context }); }, py::arg("ms") ) @@ -193,7 +192,7 @@ PYBIND11_MODULE(bindings, m) py::class_(m, "Repo") .def(py::init( [](MPool& pool, const std::string& name, const std::string& filename, const std::string& url - ) { return MRepo(pool, name, filename, RepoMetadata{/* .url=*/url}); } + ) { return MRepo(pool, name, filename, RepoMetadata{ /* .url=*/url }); } )) .def(py::init()) .def("add_extra_pkg_info", &MRepo::py_add_extra_pkg_info) @@ -340,7 +339,7 @@ PYBIND11_MODULE(bindings, m) py::class_(m, "History") .def(py::init( [](const fs::u8path& path) { - return History{path, mambapy::singletons().channel_context}; + return History{ path, mambapy::singletons().channel_context }; } )) .def("get_requested_specs_map", &History::get_requested_specs_map); @@ -409,7 +408,7 @@ PYBIND11_MODULE(bindings, m) case query::RECURSIVETABLE: res.table( res_stream, - {"Name", "Version", "Build", concat("Depends:", query), "Channel"} + { "Name", "Version", "Build", concat("Depends:", query), "Channel" } ); } if (res.empty() && format != query::JSON) @@ -474,25 +473,13 @@ PYBIND11_MODULE(bindings, m) .def( "cache_path", [](const MSubdirData& self) -> std::string { return extract(self.cache_path()); } - ) - .def( - "download_and_check_targets", - [](MSubdirData& self, MultiDownloadTarget& multi_download) -> bool - { - for (auto& check_target : self.check_targets()) - { - multi_download.add(check_target.get()); - } - multi_download.download(MAMBA_NO_CLEAR_PROGRESS_BARS); - return self.check_targets().size(); - } - ) - .def("finalize_checks", &MSubdirData::finalize_checks); + ); m.def("cache_fn_url", &cache_fn_url); m.def("create_cache_dir", &create_cache_dir); - pyMultiDownloadTarget.def(py::init<>()) + py::class_(m, "DownloadTargetList") + .def(py::init<>()) .def( "add", [](MultiDownloadTarget& self, MSubdirData& sub) -> void { self.add(sub.target()); } diff --git a/mamba/mamba/utils.py b/mamba/mamba/utils.py index 59e26e389b..6d542bdbe5 100644 --- a/mamba/mamba/utils.py +++ b/mamba/mamba/utils.py @@ -102,23 +102,10 @@ def fixup_channel_spec(spec): channel, channel_platform, full_url, pkgs_dirs, repodata_fn ) - needs_finalising = sd.download_and_check_targets(dlist) index.append( - ( - sd, - { - "platform": channel_platform, - "url": url, - "channel": channel, - "needs_finalising": needs_finalising, - }, - ) + (sd, {"platform": channel_platform, "url": url, "channel": channel}) ) - - for sd, info in index: - if info["needs_finalising"]: - sd.finalize_checks() - dlist.add(sd) + dlist.add(sd) is_downloaded = dlist.download(api.MAMBA_DOWNLOAD_FAILFAST) diff --git a/mamba_package/src/main.cpp b/mamba_package/src/main.cpp index 99a887abb8..3fcbe9124f 100644 --- a/mamba_package/src/main.cpp +++ b/mamba_package/src/main.cpp @@ -21,7 +21,7 @@ main(int argc, char** argv) using namespace mamba; // NOLINT(build/namespaces) Configuration config; - CLI::App app{"Version: " + version() + "\n"}; + CLI::App app{ "Version: " + version() + "\n" }; set_package_command(&app); try diff --git a/micromamba/src/common_options.cpp b/micromamba/src/common_options.cpp index c6ed020b05..eb4c3ca57b 100644 --- a/micromamba/src/common_options.cpp +++ b/micromamba/src/common_options.cpp @@ -49,14 +49,13 @@ init_general_options(CLI::App* subcom, Configuration& config) ->multi_option_policy(CLI::MultiOptionPolicy::Sum) ->group(cli_group); - std::map le_map = { - {"critical", mamba::log_level::critical}, - {"error", mamba::log_level::err}, - {"warning", mamba::log_level::warn}, - {"info", mamba::log_level::info}, - {"debug", mamba::log_level::debug}, - {"trace", mamba::log_level::trace}, - {"off", mamba::log_level::off}}; + std::map le_map = { { "critical", mamba::log_level::critical }, + { "error", mamba::log_level::err }, + { "warning", mamba::log_level::warn }, + { "info", mamba::log_level::info }, + { "debug", mamba::log_level::debug }, + { "trace", mamba::log_level::trace }, + { "off", mamba::log_level::off } }; auto& log_level = config.at("log_level"); subcom ->add_option("--log-level", log_level.get_cli_config(), log_level.description()) @@ -181,7 +180,7 @@ init_channel_parser(CLI::App* subcom, Configuration& config) using string_list = std::vector; auto& channels = config.at("channels"); - channels.needs({"override_channels"}); + channels.needs({ "override_channels" }); subcom ->add_option("-c,--channel", channels.get_cli_config(), channels.description()) ->type_size(1) @@ -192,7 +191,7 @@ init_channel_parser(CLI::App* subcom, Configuration& config) .group("cli") .set_env_var_names() .description("Override channels") - .needs({"override_channels_enabled"}) + .needs({ "override_channels_enabled" }) .set_post_merge_hook([&](bool& value) { return override_channels_hook(config, value); }), true @@ -203,10 +202,9 @@ init_channel_parser(CLI::App* subcom, Configuration& config) override_channels.description() ); - std::map cp_map = { - {"disabled", ChannelPriority::kDisabled}, - {"flexible", ChannelPriority::kFlexible}, - {"strict", ChannelPriority::kStrict}}; + std::map cp_map = { { "disabled", ChannelPriority::kDisabled }, + { "flexible", ChannelPriority::kFlexible }, + { "strict", ChannelPriority::kStrict } }; auto& channel_priority = config.at("channel_priority"); subcom ->add_option( @@ -251,7 +249,7 @@ init_channel_parser(CLI::App* subcom, Configuration& config) no_channel_priority.description() ); - channel_priority.needs({"strict_channel_priority", "no_channel_priority"}); + channel_priority.needs({ "strict_channel_priority", "no_channel_priority" }); } void @@ -424,10 +422,9 @@ init_install_options(CLI::App* subcom, Configuration& config) shortcuts.description() ); - std::map vl_map = { - {"enabled", VerificationLevel::kEnabled}, - {"warn", VerificationLevel::kWarn}, - {"disabled", VerificationLevel::kDisabled}}; + std::map vl_map = { { "enabled", VerificationLevel::kEnabled }, + { "warn", VerificationLevel::kWarn }, + { "disabled", VerificationLevel::kDisabled } }; auto& safety_checks = config.at("safety_checks"); subcom ->add_option( diff --git a/micromamba/src/completer.cpp b/micromamba/src/completer.cpp index 5ba5efab61..7abdf0bae4 100644 --- a/micromamba/src/completer.cpp +++ b/micromamba/src/completer.cpp @@ -140,7 +140,7 @@ add_activate_completion( { if (completer_args.size() == 1) { - completer_args = {"-n", completer_args.back()}; + completer_args = { "-n", completer_args.back() }; complete_options(app, config, completer_args, completed); } } @@ -212,7 +212,7 @@ get_completions(CLI::App* app, mamba::Configuration& config, int argc, char** ar completer_args.push_back(std::string(mamba::strip(argv[argc - 1]))); } - std::vector apps = {app}; + std::vector apps = { app }; overwrite_callbacks(apps, config, completer_args, completed); add_activate_completion(app, config, completer_args, completed); add_ps_completion(app, config, completer_args, completed); diff --git a/micromamba/src/config.cpp b/micromamba/src/config.cpp index f331aba285..0fbd69ff90 100644 --- a/micromamba/src/config.cpp +++ b/micromamba/src/config.cpp @@ -68,7 +68,7 @@ compute_config_path(Configuration& config, bool touch_if_not_exists) } else if (env_path.configured()) { - rc_source = fs::u8path{ctx.prefix_params.target_prefix / ".condarc"}; + rc_source = fs::u8path{ ctx.prefix_params.target_prefix / ".condarc" }; } else if (system_path.configured()) { diff --git a/micromamba/src/constructor.cpp b/micromamba/src/constructor.cpp index 57f5982f6d..b3e7559055 100644 --- a/micromamba/src/constructor.cpp +++ b/micromamba/src/constructor.cpp @@ -144,7 +144,7 @@ construct(Configuration& config, const fs::u8path& prefix, bool extract_conda_pk } nlohmann::json index; - std::ifstream index_file{index_path.std_path()}; + std::ifstream index_file{ index_path.std_path() }; index_file >> index; if (!repodata_record.is_null()) @@ -179,7 +179,7 @@ construct(Configuration& config, const fs::u8path& prefix, bool extract_conda_pk } LOG_TRACE << "Writing " << repodata_record_path; - std::ofstream repodata_record_of{repodata_record_path.std_path()}; + std::ofstream repodata_record_of{ repodata_record_path.std_path() }; repodata_record_of << repodata_record.dump(4); } } diff --git a/micromamba/src/env.cpp b/micromamba/src/env.cpp index d3c4f18b5f..bec377df24 100644 --- a/micromamba/src/env.cpp +++ b/micromamba/src/env.cpp @@ -176,16 +176,16 @@ set_env_command(CLI::App* com, Configuration& config) } // format and print table - printers::Table t({"Name", "Active", "Path"}); + printers::Table t({ "Name", "Active", "Path" }); t.set_alignment( - {printers::alignment::left, printers::alignment::left, printers::alignment::left} + { printers::alignment::left, printers::alignment::left, printers::alignment::left } ); - t.set_padding({2, 2, 2}); + t.set_padding({ 2, 2, 2 }); for (auto& env : env_manager.list_all_known_prefixes()) { bool is_active = (env == ctx.prefix_params.target_prefix); - t.add_row({get_env_name(env), is_active ? "*" : "", env.string()}); + t.add_row({ get_env_name(env), is_active ? "*" : "", env.string() }); } t.print(std::cout); } @@ -216,9 +216,9 @@ set_env_command(CLI::App* com, Configuration& config) Console::instance().print(join( "", - std::vector({"Environment removed at prefix: ", prefix.string()}) + std::vector({ "Environment removed at prefix: ", prefix.string() }) )); - Console::instance().json_write({{"success", true}}); + Console::instance().json_write({ { "success", true } }); } else { diff --git a/micromamba/src/info.cpp b/micromamba/src/info.cpp index edc005db0c..c992087984 100644 --- a/micromamba/src/info.cpp +++ b/micromamba/src/info.cpp @@ -31,35 +31,35 @@ set_info_command(CLI::App* subcom, mamba::Configuration& config) if (print_licenses) { const std::vector> licenses = { - {"micromamba", - "BSD license, Copyright 2019 QuantStack and the Mamba contributors."}, - {"c_ares", - "MIT license, Copyright (c) 2007 - 2018, Daniel Stenberg with many contributors, see AUTHORS file."}, - {"cli11", - "BSD license, CLI11 1.8 Copyright (c) 2017-2019 University of Cincinnati, developed by Henry Schreiner under NSF AWARD 1414736. All rights reserved."}, - {"cpp_filesystem", - "MIT license, Copyright (c) 2018, Steffen Schümann "}, - {"curl", - "MIT license, Copyright (c) 1996 - 2020, Daniel Stenberg, daniel@haxx.se, and many contributors, see the THANKS file."}, - {"krb5", - "MIT license, Copyright 1985-2020 by the Massachusetts Institute of Technology."}, - {"libarchive", - "New BSD license, The libarchive distribution as a whole is Copyright by Tim Kientzle and is subject to the copyright notice reproduced at the bottom of this file."}, - {"libev", - "BSD license, All files in libev are Copyright (c)2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann."}, - {"liblz4", "LZ4 Library, Copyright (c) 2011-2016, Yann Collet"}, - {"libnghttp2", - "MIT license, Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa; 2012, 2014, 2015, 2016 nghttp2 contributors"}, - {"libopenssl_3", "Apache license, Version 2.0, January 2004"}, - {"libopenssl", - "Apache license, Copyright (c) 1998-2019 The OpenSSL Project, All rights reserved; 1995-1998 Eric Young (eay@cryptsoft.com)"}, - {"libsolv", "BSD license, Copyright (c) 2019, SUSE LLC"}, - {"nlohmann_json", "MIT license, Copyright (c) 2013-2020 Niels Lohmann"}, - {"reproc", "MIT license, Copyright (c) Daan De Meyer"}, - {"fmt", "MIT license, Copyright (c) 2012-present, Victor Zverovich."}, - {"spdlog", "MIT license, Copyright (c) 2016 Gabi Melman."}, - {"zstd", - "BSD license, Copyright (c) 2016-present, Facebook, Inc. All rights reserved."}, + { "micromamba", + "BSD license, Copyright 2019 QuantStack and the Mamba contributors." }, + { "c_ares", + "MIT license, Copyright (c) 2007 - 2018, Daniel Stenberg with many contributors, see AUTHORS file." }, + { "cli11", + "BSD license, CLI11 1.8 Copyright (c) 2017-2019 University of Cincinnati, developed by Henry Schreiner under NSF AWARD 1414736. All rights reserved." }, + { "cpp_filesystem", + "MIT license, Copyright (c) 2018, Steffen Schümann " }, + { "curl", + "MIT license, Copyright (c) 1996 - 2020, Daniel Stenberg, daniel@haxx.se, and many contributors, see the THANKS file." }, + { "krb5", + "MIT license, Copyright 1985-2020 by the Massachusetts Institute of Technology." }, + { "libarchive", + "New BSD license, The libarchive distribution as a whole is Copyright by Tim Kientzle and is subject to the copyright notice reproduced at the bottom of this file." }, + { "libev", + "BSD license, All files in libev are Copyright (c)2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann." }, + { "liblz4", "LZ4 Library, Copyright (c) 2011-2016, Yann Collet" }, + { "libnghttp2", + "MIT license, Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa; 2012, 2014, 2015, 2016 nghttp2 contributors" }, + { "libopenssl_3", "Apache license, Version 2.0, January 2004" }, + { "libopenssl", + "Apache license, Copyright (c) 1998-2019 The OpenSSL Project, All rights reserved; 1995-1998 Eric Young (eay@cryptsoft.com)" }, + { "libsolv", "BSD license, Copyright (c) 2019, SUSE LLC" }, + { "nlohmann_json", "MIT license, Copyright (c) 2013-2020 Niels Lohmann" }, + { "reproc", "MIT license, Copyright (c) Daan De Meyer" }, + { "fmt", "MIT license, Copyright (c) 2012-present, Victor Zverovich." }, + { "spdlog", "MIT license, Copyright (c) 2016 Gabi Melman." }, + { "zstd", + "BSD license, Copyright (c) 2016-present, Facebook, Inc. All rights reserved." }, }; for (const auto& [dep, text] : licenses) { diff --git a/micromamba/src/main.cpp b/micromamba/src/main.cpp index 6dc3d6b1d5..478195f5f0 100644 --- a/micromamba/src/main.cpp +++ b/micromamba/src/main.cpp @@ -41,7 +41,7 @@ main(int argc, char** argv) ctx.command_params.is_micromamba = true; - CLI::App app{"Version: " + version() + "\n"}; + CLI::App app{ "Version: " + version() + "\n" }; set_umamba_command(&app, config); char** utf8argv; diff --git a/micromamba/src/microserver.cpp b/micromamba/src/microserver.cpp index 864d540e6e..a281fe5465 100644 --- a/micromamba/src/microserver.cpp +++ b/micromamba/src/microserver.cpp @@ -207,19 +207,19 @@ namespace microserver void Server::get(std::string path, callback_function_t callback) { - Route r = {path, "GET", callback, ""}; + Route r = { path, "GET", callback, "" }; m_routes.push_back(r); } void Server::post(std::string path, callback_function_t callback) { - Route r = {path, "POST", callback, ""}; + Route r = { path, "POST", callback, "" }; m_routes.push_back(r); } void Server::all(std::string path, callback_function_t callback) { - Route r = {path, "ALL", callback, ""}; + Route r = { path, "ALL", callback, "" }; m_routes.push_back(r); } diff --git a/micromamba/src/repoquery.cpp b/micromamba/src/repoquery.cpp index 6265f4bc99..9557393c11 100644 --- a/micromamba/src/repoquery.cpp +++ b/micromamba/src/repoquery.cpp @@ -40,7 +40,7 @@ set_common_search(CLI::App* subcom, mamba::Configuration& config, bool is_repoqu { subcom ->add_option("query_type", query_type, "The type of query (search, depends or whoneeds)") - ->check(CLI::IsMember(std::vector({"search", "depends", "whoneeds"}))) + ->check(CLI::IsMember(std::vector({ "search", "depends", "whoneeds" }))) ->required(); } else diff --git a/micromamba/src/run.cpp b/micromamba/src/run.cpp index 1a629ce092..f113f8d858 100644 --- a/micromamba/src/run.cpp +++ b/micromamba/src/run.cpp @@ -59,8 +59,8 @@ set_ps_command(CLI::App* subcom) { std::cout << "No running processes" << std::endl; } - printers::Table table({"PID", "Name", "Prefix", "Command"}); - table.set_padding({2, 4, 4, 4}); + printers::Table table({ "PID", "Name", "Prefix", "Command" }); + table.set_padding({ 2, 4, 4, 4 }); for (auto& el : info) { auto prefix = el["prefix"].get(); diff --git a/micromamba/src/server.cpp b/micromamba/src/server.cpp index 13dfda6618..a4519c5912 100644 --- a/micromamba/src/server.cpp +++ b/micromamba/src/server.cpp @@ -39,7 +39,7 @@ load_pool( { auto& ctx = Context::instance(); ctx.channels = channels; - mamba::MPool pool{channel_context}; + mamba::MPool pool{ channel_context }; auto exp_load = load_channels(pool, package_caches, false); if (!exp_load) { @@ -75,7 +75,7 @@ handle_solve_request( for (const auto& s : specs) { - if (auto m = MatchSpec{s, channel_context}; !m.channel.empty()) + if (auto m = MatchSpec{ s, channel_context }; !m.channel.empty()) { channels.push_back(m.channel); } @@ -88,7 +88,8 @@ handle_solve_request( { cache_map.insert_or_assign( cache_key, - cache{load_pool(channels, package_caches, channel_context), std::chrono::system_clock::now()} + cache{ load_pool(channels, package_caches, channel_context), + std::chrono::system_clock::now() } ); } else @@ -98,9 +99,8 @@ handle_solve_request( { cache_map.insert_or_assign( cache_key, - cache{ - load_pool(channels, package_caches, channel_context), - std::chrono::system_clock::now()} + cache{ load_pool(channels, package_caches, channel_context), + std::chrono::system_clock::now() } ); } } @@ -134,9 +134,9 @@ handle_solve_request( MSolver solver( *cache_entry.pool, - {{SOLVER_FLAG_ALLOW_UNINSTALL, ctx.allow_uninstall}, - {SOLVER_FLAG_ALLOW_DOWNGRADE, ctx.allow_downgrade}, - {SOLVER_FLAG_STRICT_REPO_PRIORITY, ctx.channel_priority == ChannelPriority::kStrict}} + { { SOLVER_FLAG_ALLOW_UNINSTALL, ctx.allow_uninstall }, + { SOLVER_FLAG_ALLOW_DOWNGRADE, ctx.allow_downgrade }, + { SOLVER_FLAG_STRICT_REPO_PRIORITY, ctx.channel_priority == ChannelPriority::kStrict } } ); solver.add_jobs(specs, SOLVER_INSTALL); @@ -151,7 +151,7 @@ handle_solve_request( } else { - MTransaction trans{*cache_entry.pool, solver, package_caches}; + MTransaction trans{ *cache_entry.pool, solver, package_caches }; auto to_install = std::get<1>(trans.to_conda()); std::vector packages; for (auto& p : to_install) @@ -177,7 +177,7 @@ run_server(int port, mamba::ChannelContext& channel_context, Configuration& conf server_sink->set_level(spdlog::level::debug); server_sink->set_pattern("%^[%H:%M:%S]%$ %v"); - spdlog::logger logger("server", {server_sink}); + spdlog::logger logger("server", { server_sink }); microserver::Server xserver(logger); xserver.get( diff --git a/micromamba/src/shell.cpp b/micromamba/src/shell.cpp index f37cf536e8..a829923f41 100644 --- a/micromamba/src/shell.cpp +++ b/micromamba/src/shell.cpp @@ -30,7 +30,7 @@ namespace subcmd ->add_option("-s,--shell", shell_type.get_cli_config(), shell_type.description()) ->check(CLI::IsMember(std::set( - {"bash", "posix", "powershell", "cmd.exe", "xonsh", "zsh", "fish", "tcsh", "dash"} + { "bash", "posix", "powershell", "cmd.exe", "xonsh", "zsh", "fish", "tcsh", "dash" } ))); } @@ -111,7 +111,7 @@ namespace { if (!shell_type.empty()) { - return std::string{shell_type}; + return std::string{ shell_type }; } LOG_DEBUG << "No shell type provided"; @@ -340,7 +340,7 @@ namespace exit(mamba::run_in_environment( Context::instance().prefix_params.root_prefix, - {get_shell()}, + { get_shell() }, ".", static_cast(STREAM_OPTIONS::ALL_STREAMS), false, @@ -406,14 +406,8 @@ set_shell_command(CLI::App* shell_subcmd, Configuration& config) // TODO micromamba 2.0 rename this command (e.g. start-shell) or the other to avoid // confusion between `micromamba shell` and `micromamba shell subsubcmd`. const auto all_subsubcmds = std::array{ - init_subsubcmd, - deinit_subsubcmd, - reinit_subsubcmd, - hook_subsubcmd, - acti_subsubcmd, - reacti_subsubcmd, - deacti_subsubcmd, - long_path_subsubcmd, + init_subsubcmd, deinit_subsubcmd, reinit_subsubcmd, hook_subsubcmd, + acti_subsubcmd, reacti_subsubcmd, deacti_subsubcmd, long_path_subsubcmd, }; set_shell_launch_command(shell_subcmd, all_subsubcmds, config); } diff --git a/micromamba/src/update.cpp b/micromamba/src/update.cpp index 538ea89af7..6cdacad0a8 100644 --- a/micromamba/src/update.cpp +++ b/micromamba/src/update.cpp @@ -33,7 +33,7 @@ update_self(Configuration& config, const std::optional& version) ctx.prefix_params.target_prefix = ctx.prefix_params.root_prefix; mamba::ChannelContext channel_context; - mamba::MPool pool{channel_context}; + mamba::MPool pool{ channel_context }; mamba::MultiPackageCache package_caches(ctx.pkgs_dirs); auto exp_loaded = load_channels(pool, package_caches, 0); @@ -46,11 +46,11 @@ update_self(Configuration& config, const std::optional& version) std::string matchspec = version ? fmt::format("micromamba={}", version.value()) : fmt::format("micromamba>{}", umamba::version()); - auto solvable_ids = pool.select_solvables(pool.matchspec2id({matchspec, channel_context}), true); + auto solvable_ids = pool.select_solvables(pool.matchspec2id({ matchspec, channel_context }), true); if (solvable_ids.empty()) { - if (pool.select_solvables(pool.matchspec2id({"micromamba", channel_context})).empty()) + if (pool.select_solvables(pool.matchspec2id({ "micromamba", channel_context })).empty()) { throw mamba::mamba_error( "No micromamba found in the loaded channels. Add 'conda-forge' to your config file.", @@ -86,7 +86,7 @@ update_self(Configuration& config, const std::optional& version) ); ctx.download_only = true; - MTransaction t(pool, {latest_micromamba.value()}, package_caches); + MTransaction t(pool, { latest_micromamba.value() }, package_caches); auto exp_prefix_data = PrefixData::create(ctx.prefix_params.root_prefix, channel_context); if (!exp_prefix_data) { @@ -140,8 +140,8 @@ update_self(Configuration& config, const std::optional& version) // Command to reinit shell from the new executable. // Adding bash as the shell but this is just a placeholder as the find_initialized_shells() // deals with the reinit. - std::vector - command = {mamba_exe, "shell", "reinit", "-s", "bash", "-p", prefix_data.path()}; + std::vector command = { mamba_exe, "shell", "reinit", "-s", + "bash", "-p", prefix_data.path() }; // The options for the process reproc::options options; diff --git a/micromamba/src/version.cpp b/micromamba/src/version.cpp index 74046ec9b8..6173b17354 100644 --- a/micromamba/src/version.cpp +++ b/micromamba/src/version.cpp @@ -16,6 +16,6 @@ namespace umamba std::array version_arr() { - return {UMAMBA_VERSION_MAJOR, UMAMBA_VERSION_MINOR, UMAMBA_VERSION_PATCH}; + return { UMAMBA_VERSION_MAJOR, UMAMBA_VERSION_MINOR, UMAMBA_VERSION_PATCH }; } }