Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
7da7f8d3e9
!12 fix python provide and requires
From: @chen-huihan 
Reviewed-by: @xinsheng3, @zhuchunyi 
Signed-off-by: @zhuchunyi
2024-08-13 01:28:38 +00:00
chen-huihan
6cdd8a8788 fix python provide and requires 2024-08-06 15:13:26 +08:00
openeuler-ci-bot
e753a7c061
!11 Fix the python3 version cannot be found when pyproject.toml is used for building
From: @caodongxia 
Reviewed-by: @gaoruoshu 
Signed-off-by: @gaoruoshu
2023-04-23 08:01:43 +00:00
caodongxia
7f3eea9451 Fix the python3 version cannot be found when pyproject.toml is used for building 2023-04-23 15:27:00 +08:00
openeuler-ci-bot
282ac800a3
!10 [sync] PR-8: 【轻量级 PR】:Rebuild for next release
From: @openeuler-sync-bot 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2022-11-03 02:28:18 +00:00
张瑞方
fba5d87052 Rebuild for next release
Signed-off-by: 张瑞方 <xdzhangruifang@163.com>
(cherry picked from commit 62e1bf8c62b616b67ef4fe285ea3f5563827d57f)
2022-11-01 17:00:50 +08:00
openeuler-ci-bot
40d76f3193
!7 [sync] PR-6: downgrade version to 9
Merge pull request !7 from openeuler-sync-bot/sync-pr6-openEuler-22.03-LTS-Next-to-master
2022-01-20 08:16:00 +00:00
shixuantong
4817f8fc81 downgrade version to 9
(cherry picked from commit 2f58820e751848187ade2aa4dc03ba9afc2d0de1)
2022-01-20 15:32:46 +08:00
openeuler-ci-bot
3e0b18efa1 !4 upgrade version to 12
Merge pull request !4 from SandMan/master
2021-12-25 03:05:01 +00:00
Anonymous_Z
44b24878c3 upgrade version to 12 2021-12-09 17:36:23 +08:00
3 changed files with 21 additions and 6 deletions

View File

@ -2,7 +2,7 @@
Name: python-rpm-generators
Version: 9
Release: 1
Release: 5
Summary: Dependency generators for Python RPMs
License: GPLv2+
@ -44,5 +44,20 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py
%{_rpmconfigdir}/pythondistdeps.py
%changelog
* Tue Aug 06 2024 chenhuihan <chenhuihan@huawei.com> - 9-5
- Fix python provide and requires
* 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
- Rebuild for next release
* Fri Jan 07 2022 shixuantong <shixuantong@huawei.com> - 9-2
- downgrade version to 9
* Thu Dec 09 2021 liudabo <liudabo1@huawei.com> - 12-1
- upgrade version to 12
* Tue Sep 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 9-1
- Package init

View File

@ -13,8 +13,8 @@ case $1 in
# generating a line of the form
# python(abi) = MAJOR.MINOR
# (Don't match against -config tools e.g. /usr/bin/python2.6-config)
grep "/usr/bin/python.\..$" \
| sed -e "s|.*/usr/bin/python\(.\..\)|python(abi) = \1|"
grep "/usr/bin/python.\...$" \
| sed -e "s|.*/usr/bin/python\(.\...\)|python(abi) = \1|"
;;
-R|--requires)
shift
@ -23,8 +23,8 @@ case $1 in
# /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/
# generating (uniqely) lines of the form:
# python(abi) = MAJOR.MINOR
grep "/usr/lib[^/]*/python.\../.*" \
| sed -e "s|.*/usr/lib[^/]*/python\(.\..\)/.*|python(abi) = \1|g" \
grep "/usr/lib[^/]*/python.\.../.*" \
| sed -e "s|.*/usr/lib[^/]*/python\(.\...\)/.*|python(abi) = \1|g" \
| sort | uniq
;;
esac

View File

@ -116,7 +116,7 @@ for f in files:
# Try to parse the Python version from the path the metadata
# resides at (e.g. /usr/lib/pythonX.Y/site-packages/...)
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:
dist.py_version = res.group('pyver')
else: