Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
0f2a3d13af
!23 update to 0.7.0
From: @zhuofeng6 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2022-11-04 09:29:24 +00:00
zhuofeng
ffa9d75e9c update to 0.7.0 2022-11-02 17:06:01 +08:00
openeuler-ci-bot
188f79d0b5
!21 [sync] PR-20: enable check
From: @openeuler-sync-bot 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2022-06-21 12:27:09 +00:00
shixuantong
1909f126b8 enable check
(cherry picked from commit de326c78f5088bcda1a0326b854fb71ad5a8bf6b)
2022-06-21 18:52:18 +08:00
openeuler-ci-bot
eb40b8c0d1
!17 修复升级时报错文件冲突问题
From: @tong_1001 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2022-06-21 01:04:58 +00:00
shixuantong
82f45ce7ca fix file conflict 2022-06-20 15:49:26 +08:00
openeuler-ci-bot
5734f86d91 !16 [sync] PR-15: upgrade version to 0.6.3
Merge pull request !16 from openeuler-sync-bot/sync-pr15-master-to-openEuler-22.03-LTS-Next
2021-12-28 12:11:45 +00:00
Anonymous_Z
1f00aea593 upgrade version to 0.6.3
(cherry picked from commit 0da10dbb0af332f500c115f8d40c6830b74a7222)
2021-12-27 17:31:01 +08:00
openeuler-ci-bot
36fc0ecc0f !11 remove python2
From: @wcc_140409
Reviewed-by: @xiezhipeng1
Signed-off-by: @xiezhipeng1
2020-10-30 19:44:18 +08:00
19909236985
136ef40775 remove python2 2020-10-30 14:37:47 +08:00
4 changed files with 24 additions and 53 deletions

View File

@ -1,31 +0,0 @@
From 208b963455fa5ff658b24e513639f27ef66920ce Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Wed, 2 Sep 2020 09:32:30 +0800
Subject: [PATCH] Fix import of utilist
reason:If procfs/utilist.py is not in your PYTHONPATH, the import can fail.
Specify it fully.
Signed-off-by: John Kacur <jkacur@redhat.com>
https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/+/208b963455fa5ff658b24e513639f27ef66920ce%5E%21/
---
procfs/procfs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/procfs/procfs.py b/procfs/procfs.py
index a586ae2..3cfa941 100755
--- a/procfs/procfs.py
+++ b/procfs/procfs.py
@@ -21,7 +21,7 @@
import os, time
from functools import reduce
from six.moves import range
-from utilist import bitmasklist
+from procfs.utilist import bitmasklist
import platform
import re
--
2.19.1

Binary file not shown.

Binary file not shown.

View File

@ -2,31 +2,22 @@
Python classes to extract information from the Linux kernel /proc files.
Name: python-linux-procfs
Version: 0.6.2
Release: 3
Version: 0.7.0
Release: 1
Summary: Linux /proc abstraction classes
License: GPLv2
URL: https://rt.wiki.kernel.org/index.php/Tuna
Source: https://git.kernel.org/pub/scm/libs/python/%{name}/%{name}.git/snapshot/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: python2-devel python2-setuptools
BuildRequires: python3-devel python3-setuptools
Patch0: backport-Fix-import-of-utilist.patch
BuildRequires: python3-devel python3-setuptools python3-six
%description %_description
%package -n python2-linux-procfs
Summary: %summary
%{?python_provide:%python_provide python2-linux-procfs}
Requires: python2-six
%description -n python2-linux-procfs %_description
%package -n python3-linux-procfs
Summary: %summary
%{?python_provide:%python_provide python3-linux-procfs}
Requires: python3-six
Obsoletes: python2-linux-procfs
%description -n python3-linux-procfs %_description
@ -34,20 +25,13 @@ Requires: python3-six
%autosetup -p1
%build
%py2_build
%py3_build
%install
%py2_install
%py3_install
%files -n python2-linux-procfs
%defattr(0755,root,root,0755)
%{python2_sitelib}/procfs/
%{_bindir}/pflags
%defattr(0644,root,root,0755)
%{python2_sitelib}/*.egg-info
%license COPYING
%check
%{__python3} bitmasklist_test.py
%files -n python3-linux-procfs
%defattr(0755,root,root,0755)
@ -58,6 +42,24 @@ Requires: python3-six
%license COPYING
%changelog
* Wed Nov 02 2022 zhuofeng <zhuofeng2@huawei.com> - 0.7.0-1
- update to 0.7.0
* Tue Jun 21 2022 shixuantong <shixuantong@h-partners.com> - 0.6.3-3
- enable check
* Mon Jun 20 2022 shixuantong <shixuantong@h-partners.com> - 0.6.3-2
- fix file conflict
* Wed Nov 24 2021 liudabo <liudabo1@huawei.com> - 0.6.3-1
- upgrade version to 0.6.3
* Fri Oct 30 2020 wuchaochao <wuchaochao4@huawei.com> - 0.6.2-4
- Type:bufix
- CVE:NA
- SUG:NA
- DESC:remove python2
* Sat Sep 5 2020 shixuantong <shixuantong@huawei.com> - 0.6.2-3
- update Source0