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
Amend test suite for compatibility with libmamba v2 #13784
base: main
Are you sure you want to change the base?
Conversation
CodSpeed Performance ReportMerging #13784 will not alter performanceComparing Summary
|
@@ -707,6 +708,9 @@ def test_nonexistent_deps(self, env): | |||
"test::pip-1.3.1-py33_1", | |||
} | |||
|
|||
# Add 1s to make sure the new repodata.jsons have different mod times |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# Add 1s to make sure the new repodata.jsons have different mod times | |
# Add 1s to make sure the new repodata.jsons have different mod times | |
# To be fixed by https://github.com/conda/conda/issues/13783 |
# LIBMAMBA ADJUSTMENT | ||
# libmamba doesn't remove xz in this solve | ||
*(() if context.solver == "libmamba" else ("channel-2::xz-5.2.3-0",)), | ||
"channel-2::xz-5.2.3-0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
v2 fixed this solver difference. We can still bring it back with this change, though.
@@ -124,7 +124,7 @@ def bash_unsupported() -> str | None: | |||
|
|||
|
|||
skip_unsupported_bash = pytest.mark.skipif( | |||
bash_unsupported(), | |||
bool(bash_unsupported()), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think a recent pytest release got stricter about the types here.
Description
Companion PR for conda/conda-libmamba-solver#457.
Checklist - did you ...
news
directory (using the template) for the next release's release notes?