Merge branch 'main' into dev_loong64

Author: zevanzhao

dev/environment-dev.yml

@@ -29,6 +29,7 @@ dependencies:
   # micromamba test dependencies
   - python
   - mitmproxy
+  - bcrypt==4.0.1 # An indirect dependency pin due to failures on MacOS
   - pytest >=7.3.0
   - pytest-asyncio
   - pytest-timeout

libmamba/ext/solv-cpp/include/solv-cpp/solvable.hpp

@@ -53,6 +53,7 @@ namespace solv
         auto build_string() const -> std::string_view;
         auto file_name() const -> std::string_view;
         auto license() const -> std::string_view;
+        auto python_site_packages_path() const -> std::string_view;
         auto md5() const -> std::string_view;
         auto noarch() const -> std::string_view;
         auto sha256() const -> std::string_view;
@@ -168,6 +169,17 @@ namespace solv
         void set_license(raw_str_view str) const;
         void set_license(const std::string& str) const;
 
+        /**
+         * Set the python_site_packages_path of the solvable.
+         *
+         * This is not used by libsolv and is purely for data storing.
+         *
+         * @note A call to @ref ObjRepoView::internalize is required for this attribute to
+         *       be available for lookup.
+         */
+        void set_python_site_packages_path(raw_str_view str) const;
+        void set_python_site_packages_path(const std::string& str) const;
+
         /**
          * Set the md5 hash of the solvable file.
          *

libmamba/ext/solv-cpp/src/solvable.cpp

@@ -206,6 +206,22 @@ namespace solv
         return set_license(str.c_str());
     }
 
+    auto ObjSolvableViewConst::python_site_packages_path() const -> std::string_view
+    {
+        return ptr_to_strview(::solvable_lookup_str(const_cast<::Solvable*>(raw()), SOLVABLE_MEDIABASE)
+        );
+    }
+
+    void ObjSolvableView::set_python_site_packages_path(raw_str_view str) const
+    {
+        ::solvable_set_str(raw(), SOLVABLE_MEDIABASE, str);
+    }
+
+    void ObjSolvableView::set_python_site_packages_path(const std::string& str) const
+    {
+        return set_python_site_packages_path(str.c_str());
+    }
+
     auto ObjSolvableViewConst::md5() const -> std::string_view
     {
         ::Id type = 0;

libmamba/ext/solv-cpp/tests/src/test_solvable.cpp

@@ -43,6 +43,7 @@ namespace
             solv.set_build_string("build");
             solv.set_file_name("file.tar.gz");
             solv.set_license("MIT");
+            solv.set_python_site_packages_path("dummy_pspp");
             solv.set_md5("6f29ba77e8b03b191c9d667f331bf2a0");
             solv.set_sha256("ecde63af23e0d49c0ece19ec539d873ea408a6f966d3126994c6d33ae1b9d3f7");
             solv.set_signatures(
@@ -62,6 +63,7 @@ namespace
                 REQUIRE(solv.build_string() == "");
                 REQUIRE(solv.file_name() == "");
                 REQUIRE(solv.license() == "");
+                REQUIRE(solv.python_site_packages_path() == "");
                 REQUIRE(solv.md5() == "");
                 REQUIRE(solv.sha256() == "");
                 REQUIRE(solv.signatures() == "");
@@ -83,6 +85,7 @@ namespace
                 REQUIRE(solv.build_string() == "build");
                 REQUIRE(solv.file_name() == "file.tar.gz");
                 REQUIRE(solv.license() == "MIT");
+                REQUIRE(solv.python_site_packages_path() == "dummy_pspp");
                 REQUIRE(solv.md5() == "6f29ba77e8b03b191c9d667f331bf2a0");
                 REQUIRE(
                     solv.sha256() == "ecde63af23e0d49c0ece19ec539d873ea408a6f966d3126994c6d33ae1b9d3f7"

libmamba/include/mamba/core/transaction.hpp

@@ -82,7 +82,16 @@ namespace mamba
         History::UserRequest m_history_entry;
         solver::Solution m_solution;
 
+        /** Pair of current Python version, and potential update. */
         std::pair<std::string, std::string> m_py_versions;
+        /**
+         * The potential "python_site_package" entry.
+         *
+         * Found in the the new or installed python interpreter.
+         * Key is added as part of CEP-17.
+         * https://conda.org/learn/ceps/cep-0017
+         */
+        std::string m_python_site_packages_path;
         std::vector<specs::MatchSpec> m_requested_specs;
 
         MTransaction(const CommandParams& command_params, MultiPackageCache&);

libmamba/include/mamba/specs/build_number_spec.hpp

@@ -124,16 +124,9 @@ namespace mamba::specs
          */
         [[nodiscard]] auto contains(BuildNumber point) const -> bool;
 
-        // TODO(C++20): replace by the `= default` implementation of `operator==`
-        [[nodiscard]] auto operator==(const BuildNumberSpec& other) const -> bool
-        {
-            return m_predicate == other.m_predicate;
-        }
+        [[nodiscard]] auto operator==(const BuildNumberSpec& other) const -> bool = default;
 
-        [[nodiscard]] auto operator!=(const BuildNumberSpec& other) const -> bool
-        {
-            return !(*this == other);
-        }
+        [[nodiscard]] auto operator!=(const BuildNumberSpec& other) const -> bool = default;
 
     private:
 

libmamba/include/mamba/specs/match_spec.hpp

@@ -23,7 +23,6 @@
 #include "mamba/specs/version_spec.hpp"
 #include "mamba/util/flat_set.hpp"
 #include "mamba/util/heap_optional.hpp"
-#include "mamba/util/tuple_hash.hpp"
 
 namespace mamba::specs
 {
@@ -142,22 +141,15 @@ namespace mamba::specs
          */
         [[nodiscard]] auto contains_except_channel(const PackageInfo& pkg) const -> bool;
 
-        // TODO(C++20): replace by the `= default` implementation of `operator==`
-        [[nodiscard]] auto operator==(const MatchSpec& other) const -> bool
-        {
-            return m_channel == other.m_channel               //
-                   && m_version == other.m_version            //
-                   && m_name == other.m_name                  //
-                   && m_build_string == other.m_build_string  //
-                   && m_name_space == other.m_name_space      //
-                   && m_build_number == other.m_build_number  //
-                   && m_extra == other.m_extra;
-        }
+        /**
+         * Naive attribute-wise comparison.
+         *
+         * @warning Some complex matchspec could compare to false but actually represent the same
+         * set of packages. This strong equality is hard to detect.
+         */
+        [[nodiscard]] auto operator==(const MatchSpec& other) const -> bool = default;
 
-        [[nodiscard]] auto operator!=(const MatchSpec& other) const -> bool
-        {
-            return !(*this == other);
-        }
+        [[nodiscard]] auto operator!=(const MatchSpec& other) const -> bool = default;
 
         auto extra_members_hash() const -> std::size_t;
 

libmamba/include/mamba/specs/package_info.hpp

@@ -47,6 +47,7 @@ namespace mamba::specs
         std::string license = {};
         std::string md5 = {};
         std::string sha256 = {};
+        std::string python_site_packages_path = {};
         std::string signatures = {};
         std::vector<std::string> track_features = {};
         std::vector<std::string> dependencies = {};

libmamba/include/mamba/specs/repo_data.hpp

@@ -63,6 +63,9 @@ namespace mamba::specs
         /** Optionally a SHA256 hash of the package archive. */
         std::optional<std::string> sha256 = {};
 
+        /** Optionally a path to the site-packages directory. */
+        std::optional<std::string> python_site_packages_path = {};
+
         /** A deprecated md5 hash. */
         std::optional<std::string> legacy_bz2_md5 = {};
 

libmamba/src/core/query.cpp

@@ -325,6 +325,11 @@ namespace mamba
                 fmt::print(out, fmtstring, "Track Features", fmt::join(pkg.track_features, ","));
             }
 
+            if (!pkg.python_site_packages_path.empty())
+            {
+                fmt::print(out, fmtstring, "Site-packages", pkg.python_site_packages_path);
+            }
+
             // std::cout << fmt::format<char>(
             // " {:<15} {:%Y-%m-%d %H:%M:%S} UTC\n", "Timestamp", fmt::gmtime(pkg.timestamp));