Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use libsolv wrappers in MPool and MRepo #2453

Merged
merged 34 commits into from
May 5, 2023

Conversation

AntoinePrv
Copy link
Member

@AntoinePrv AntoinePrv commented Apr 12, 2023

@AntoinePrv AntoinePrv self-assigned this Apr 12, 2023
@AntoinePrv AntoinePrv marked this pull request as draft April 12, 2023 08:27
@AntoinePrv AntoinePrv force-pushed the solv-use-new-itf branch 4 times, most recently from 5de3c04 to 22117bf Compare April 19, 2023 15:18
@AntoinePrv AntoinePrv force-pushed the solv-use-new-itf branch 8 times, most recently from f777757 to 45171d1 Compare April 25, 2023 14:04
@AntoinePrv AntoinePrv changed the title Use libsolv wrappers in libmamba Use libsolv wrappers in MPool and MRepo Apr 25, 2023
@AntoinePrv AntoinePrv force-pushed the solv-use-new-itf branch 3 times, most recently from 11dd430 to 5dc9496 Compare April 27, 2023 08:23
@AntoinePrv AntoinePrv marked this pull request as ready for review April 28, 2023 12:10
Copy link
Member

@Klaim

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Globally LGTM 👍🏽


private:
struct [[deprecated]] PyExtraPkgInfo
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if [[deprecated]] is useful here as we'll change the major version?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's mostly for internal use, we'll know to remove it in the major release and it is to indicate that it is not needed internally anymore.

namespace
{
/** Remove potential subdir from channel name (not url!). */
auto cut_subdir(std::string_view str) -> std::string
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have similar code somewhere else in mamba, Iĺl try to find it.



#define MAMBA_TOOL_VERSION "1.1"
#define MAMBA_TOOL_VERSION "1.3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this version? libmamba is version 1.4.x at this point

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the version of the binary serialization of libsolv data. We slap our own version into it to update when we changes the internal libsolv data.

Probably not the best way to do this, because you need to deserialize it to be able to read it. We should think of something better...


void ObjRepoView::legacy_read_conda_repodata(const fs::u8path& repodata_file, int flags) const
{
auto file = CFile::open(repodata_file, "rb");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldnt file be tested here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is done in the CFile::open function.

@AntoinePrv AntoinePrv merged commit 15f6b6e into mamba-org:main May 5, 2023
@AntoinePrv AntoinePrv deleted the solv-use-new-itf branch May 5, 2023 09:07
@AntoinePrv
Copy link
Member Author

Merging because this is a blocker and many reviewers are unavailable.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants