packages/python-rpm-generators
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!11 Fix the python3 version cannot be found when pyproject.toml is used for building

Browse Source 
From: @caodongxia 
Reviewed-by: @gaoruoshu 
Signed-off-by: @gaoruoshu
This commit is contained in:
openeuler-ci-bot 2023-04-23 08:01:43 +00:00 committed by Gitee
commit e753a7c061
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-rpm-generators.spec
View File

@ -2,7 +2,7 @@
Name: python-rpm-generators Name: python-rpm-generators
Version: 9 Version: 9
Release: 3 Release: 4
Summary: Dependency generators for Python RPMs Summary: Dependency generators for Python RPMs
License: GPLv2+ License: GPLv2+
@ -44,6 +44,9 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py
%{_rpmconfigdir}/pythondistdeps.py %{_rpmconfigdir}/pythondistdeps.py
%changelog %changelog
* Sun Apr 23 2023 caodongxia <caodongxia@h-partners.com> - 9-4
- Fix the python3 version cannot be found when pyproject.toml is used for building
* Thu Oct 27 2022 zhangruifang <zhangruifang1@h-partners.com> - 9-3 * Thu Oct 27 2022 zhangruifang <zhangruifang1@h-partners.com> - 9-3
- Rebuild for next release - Rebuild for next release

2
pythondistdeps.py
View File

@ -116,7 +116,7 @@ for f in files:
# Try to parse the Python version from the path the metadata # Try to parse the Python version from the path the metadata
# resides at (e.g. /usr/lib/pythonX.Y/site-packages/...) # resides at (e.g. /usr/lib/pythonX.Y/site-packages/...)
import re import re
res = re.search(r"/python(?P<pyver>\d+\.\d)/", path_item) res = re.search(r"/python(?P<pyver>\d+\.\d+)/", path_item)
if res: if res:
dist.py_version = res.group('pyver') dist.py_version = res.group('pyver')
else: else: