[1.2] fix: fix support for packaging v20.4 #6808
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This bug only affects the
1.2
branch (caused by a bad cherry-pick frommaster
)Poetry v1.2.2 does not work with packaging v20.4 (which is an allowed version of packaging in the pyproject.toml file).
This is because the
from packaging.utils import NormalizedName
line before packaging v20.5 only works iftyping.TYPE_CHECKING
is True.This is not an issue on the
master
branch, since there this import is already hidden behind anif TYPE_CHECKING:
guard. However, the v1.2 branch never cherry-picked the appropriate commit adding this change.See the current
master
branch, which works fine:poetry/src/poetry/installation/installer.py
Lines 21 to 26 in 16046d9
Fixes: 04c5cbf (this was the broken cherry-pick)
Pull Request Check List
Resolves: #6807
packaging
v20.4, and I can't see an easy way to do this.