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

ensure provider respects subdirectory when merging and imrove subdirectory support for vcs deps #5648

Merged
merged 6 commits into from
May 21, 2022

Conversation

abn
Copy link
Member

@abn abn commented May 19, 2022

No description provided.

@abn abn requested a review from a team May 19, 2022 19:08
@abn abn force-pushed the improve-coverage-merge branch from 0758c4a to 41d214b Compare May 19, 2022 19:50
pyproject.toml Outdated Show resolved Hide resolved
src/poetry/mixology/version_solver.py Show resolved Hide resolved
src/poetry/puzzle/provider.py Show resolved Hide resolved
@abn abn force-pushed the improve-coverage-merge branch from 41d214b to 0c52d7a Compare May 19, 2022 20:56
Secrus
Secrus previously approved these changes May 19, 2022
@Secrus Secrus requested a review from a team May 19, 2022 22:42
…olving fails to avoid weird messages like "Because myapp depends on both demo (1.2.3) and demo (1.2.3), version solving failed."
@radoering
Copy link
Member

@abn I took the liberty of adding a small improvement to avoid weird error messages like "Because myapp depends on both demo (1.2.3) and demo (1.2.3), version solving failed."

Otherwise looks fine. 👍 Can be merged if CI passes and the change is OK for you.

@abn abn merged commit caffd4f into python-poetry:master May 21, 2022
@abn abn deleted the improve-coverage-merge branch May 21, 2022 15:03
@ashnair1 ashnair1 mentioned this pull request May 21, 2022
1 task
@abn abn mentioned this pull request Jun 6, 2022
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants