diff options
| author | Alexander Smirnov <[email protected]> | 2025-01-15 00:21:47 +0000 |
|---|---|---|
| committer | Alexander Smirnov <[email protected]> | 2025-01-15 00:21:47 +0000 |
| commit | adcf2ff3ae466de1966cb5acad9b3bf61d14f473 (patch) | |
| tree | af82923c28738981f3c9ce76e8d1d71eb61a2491 /contrib/python | |
| parent | de2a1e3e2f1638a777dc7240759477a8a93334b3 (diff) | |
| parent | fc7eb64e6147971fb5da235644f47a1df89e0de5 (diff) | |
Merge branch 'rightlib' into merge-libs-250115-0020
Diffstat (limited to 'contrib/python')
| -rw-r--r-- | contrib/python/packaging/py3/packaging/utils.py | 2 | ||||
| -rw-r--r-- | contrib/python/packaging/py3/patches/01-support-setuptools-71.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/contrib/python/packaging/py3/packaging/utils.py b/contrib/python/packaging/py3/packaging/utils.py index bab11b80c60..80993eff132 100644 --- a/contrib/python/packaging/py3/packaging/utils.py +++ b/contrib/python/packaging/py3/packaging/utils.py @@ -35,7 +35,7 @@ def canonicalize_name(name: str) -> NormalizedName: return cast(NormalizedName, value) -def canonicalize_version(version: Union[Version, str]) -> str: +def canonicalize_version(version: Union[Version, str], strip_trailing_zero: bool = False) -> str: """ This is very similar to Version.__str__, but has one subtle difference with the way it handles the release segment. diff --git a/contrib/python/packaging/py3/patches/01-support-setuptools-71.patch b/contrib/python/packaging/py3/patches/01-support-setuptools-71.patch new file mode 100644 index 00000000000..b3855dadb84 --- /dev/null +++ b/contrib/python/packaging/py3/patches/01-support-setuptools-71.patch @@ -0,0 +1,11 @@ +--- contrib/python/packaging/py3/packaging/utils.py (index) ++++ contrib/python/packaging/py3/packaging/utils.py (working tree) +@@ -35,7 +35,7 @@ def canonicalize_name(name: str) -> NormalizedName: + return cast(NormalizedName, value) + + +-def canonicalize_version(version: Union[Version, str]) -> str: ++def canonicalize_version(version: Union[Version, str], strip_trailing_zero: bool = False) -> str: + """ + This is very similar to Version.__str__, but has one subtle difference + with the way it handles the release segment. |