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

Amend test suite for compatibility with libmamba v2 #13784

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from

Conversation

jaimergp
Copy link
Contributor

@jaimergp jaimergp commented Apr 9, 2024

Description

Companion PR for conda/conda-libmamba-solver#457.

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Apr 9, 2024
Copy link

codspeed-hq bot commented Apr 9, 2024

CodSpeed Performance Report

Merging #13784 will not alter performance

Comparing jaimergp:libmamba-v2-fixes (befa2e0) with main (298ca49)

Summary

✅ 21 untouched benchmarks

@@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
# 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",
Copy link
Contributor Author

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()),
Copy link
Contributor Author

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Status: 🆕 New
Development

Successfully merging this pull request may close these issues.

None yet

2 participants