From 4f44dad01699a3be3a1f772aa565450777c13df1 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 14 Oct 2020 19:42:27 -0700 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/python-psutil#64d17fc0a5f9335acd49e67b99cb66f4165132b6 --- .gitignore | 1 + psutil-5.0.1-disable-broken-tests.patch | 20 ++ psutil-5.4.3-disable-broken-tests.patch | 66 +++++ python-psutil.spec | 339 ++++++++++++++++++++++++ sources | 1 + 5 files changed, 427 insertions(+) create mode 100644 psutil-5.0.1-disable-broken-tests.patch create mode 100644 psutil-5.4.3-disable-broken-tests.patch create mode 100644 python-psutil.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..aaa4abd 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +psutil-*.tar.gz diff --git a/psutil-5.0.1-disable-broken-tests.patch b/psutil-5.0.1-disable-broken-tests.patch new file mode 100644 index 0000000..3abb637 --- /dev/null +++ b/psutil-5.0.1-disable-broken-tests.patch @@ -0,0 +1,20 @@ +diff -Nur psutil-release-5.0.1.orig/psutil/tests/test_memory_leaks.py psutil-release-5.0.1/psutil/tests/test_memory_leaks.py +--- psutil-release-5.0.1.orig/psutil/tests/test_memory_leaks.py 2016-12-20 18:34:12.000000000 -0700 ++++ psutil-release-5.0.1/psutil/tests/test_memory_leaks.py 2017-01-02 10:40:49.883876413 -0700 +@@ -296,11 +296,11 @@ + + @unittest.skipUnless(WINDOWS or LINUX or FREEBSD, + "platform not supported") +- def test_cpu_affinity_set(self): +- affinity = thisproc.cpu_affinity() +- self.execute(self.proc.cpu_affinity, affinity) +- if not TRAVIS: +- self.execute_w_exc(ValueError, self.proc.cpu_affinity, [-1]) ++# def test_cpu_affinity_set(self): ++# affinity = thisproc.cpu_affinity() ++# self.execute(self.proc.cpu_affinity, affinity) ++# if not TRAVIS: ++# self.execute_w_exc(ValueError, self.proc.cpu_affinity, [-1]) + + @skip_if_linux() + def test_open_files(self): diff --git a/psutil-5.4.3-disable-broken-tests.patch b/psutil-5.4.3-disable-broken-tests.patch new file mode 100644 index 0000000..3406840 --- /dev/null +++ b/psutil-5.4.3-disable-broken-tests.patch @@ -0,0 +1,66 @@ +--- psutil/tests/test_memory_leaks.py~ 2018-01-01 14:32:56.000000000 -0600 ++++ psutil/tests/test_memory_leaks.py 2018-01-22 10:03:05.206021533 -0600 +@@ -365,14 +365,14 @@ + @skip_if_linux() + # Windows implementation is based on a single system-wide + # function (tested later). +- @unittest.skipIf(WINDOWS, "worthless on WINDOWS") +- def test_connections(self): +- # TODO: UNIX sockets are temporarily implemented by parsing +- # 'pfiles' cmd output; we don't want that part of the code to +- # be executed. +- with create_sockets(): +- kind = 'inet' if SUNOS else 'all' +- self.execute(self.proc.connections, kind) ++# @unittest.skipIf(WINDOWS, "worthless on WINDOWS") ++# def test_connections(self): ++# # TODO: UNIX sockets are temporarily implemented by parsing ++# # 'pfiles' cmd output; we don't want that part of the code to ++# # be executed. ++# with create_sockets(): ++# kind = 'inet' if SUNOS else 'all' ++# self.execute(self.proc.connections, kind) + + @unittest.skipIf(not HAS_ENVIRON, "not supported") + def test_environ(self): +--- psutil/tests/test_memory_leaks.py~ 2018-01-22 10:04:04.000000000 -0600 ++++ psutil/tests/test_memory_leaks.py 2018-01-22 10:08:05.378651502 -0600 +@@ -200,7 +200,7 @@ + "pid", "as_dict", "children", "cpu_affinity", "cpu_percent", + "ionice", "is_running", "kill", "memory_info_ex", "memory_percent", + "nice", "oneshot", "parent", "rlimit", "send_signal", "suspend", +- "terminate", "wait")) ++ "terminate", "wait", "connections")) + for name in dir(psutil.Process): + if name.startswith('_'): + continue +--- psutil/tests/test_memory_leaks.py~ 2018-01-22 10:32:07.000000000 -0600 ++++ psutil/tests/test_memory_leaks.py 2018-01-22 10:32:23.085998319 -0600 +@@ -200,7 +200,7 @@ + "pid", "as_dict", "children", "cpu_affinity", "cpu_percent", + "ionice", "is_running", "kill", "memory_info_ex", "memory_percent", + "nice", "oneshot", "parent", "rlimit", "send_signal", "suspend", +- "terminate", "wait", "connections")) ++ "terminate", "wait", "connections", "memory_maps")) + for name in dir(psutil.Process): + if name.startswith('_'): + continue +--- psutil/tests/test_memory_leaks.py~ 2018-01-22 10:32:51.000000000 -0600 ++++ psutil/tests/test_memory_leaks.py 2018-01-22 10:34:06.757525147 -0600 +@@ -344,11 +344,11 @@ + self.execute(self.proc.open_files) + + # OSX implementation is unbelievably slow +- @unittest.skipIf(OSX, "too slow on OSX") +- @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported") +- @skip_if_linux() +- def test_memory_maps(self): +- self.execute(self.proc.memory_maps) ++# @unittest.skipIf(OSX, "too slow on OSX") ++# @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported") ++# @skip_if_linux() ++# def test_memory_maps(self): ++# self.execute(self.proc.memory_maps) + + @unittest.skipIf(not LINUX, "LINUX only") + @unittest.skipIf(not HAS_RLIMIT, "not supported") diff --git a/python-psutil.spec b/python-psutil.spec new file mode 100644 index 0000000..872bc5d --- /dev/null +++ b/python-psutil.spec @@ -0,0 +1,339 @@ +%global srcname psutil +%global sum A process and system utilities module for Python + +# Filter Python modules from Provides +%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$ + +Name: python-%{srcname} +Version: 5.7.2 +Release: 2%{?dist} +Summary: %{sum} + +License: BSD +URL: https://github.com/giampaolo/psutil +Source0: %{url}/archive/release-%{version}/%{srcname}-%{version}.tar.gz +# +# Disable upstream failing test +# https://github.com/giampaolo/psutil/issues/946 +# +#Patch0: psutil-5.4.3-disable-broken-tests.patch + +BuildRequires: gcc +BuildRequires: python%{python3_pkgversion}-devel +# Test dependencies +BuildRequires: procps-ng +BuildRequires: python%{python3_pkgversion}-mock +BuildRequires: python%{python3_pkgversion}-setuptools + +%if 0%{?fedora} < 32 && 0%{?rhel} < 9 +BuildRequires: python2-mock +BuildRequires: python2-devel +BuildRequires: python2-ipaddress +BuildRequires: python2-setuptools +%else +# This package has an exception to use Python 2 in Fedora 32+ +# The exception is for chromium (chrome-remote-desktop) +# https://pagure.io/fesco/issue/2214 +BuildRequires: python27 +BuildRequires: python2-setuptools +%endif + +%description +psutil is a module providing an interface for retrieving information on all +running processes and system utilization (CPU, memory, disks, network, users) in +a portable way by using Python, implementing many functionalities offered by +command line tools such as: ps, top, df, kill, free, lsof, free, netstat, +ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. + + +%package -n python2-%{srcname} +Summary: %{sum} +%{?python_provide:%python_provide python2-%{srcname}} +Obsoletes: python-%{srcname} < 3.1.1-3 + +%description -n python2-psutil +psutil is a module providing an interface for retrieving information on all +running processes and system utilization (CPU, memory, disks, network, users) in +a portable way by using Python 3, implementing many functionalities offered by +command line tools such as: ps, top, df, kill, free, lsof, free, netstat, +ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. + +%package -n python%{python3_pkgversion}-psutil +Summary: %{sum} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} + +%description -n python%{python3_pkgversion}-psutil +psutil is a module providing an interface for retrieving information on all +running processes and system utilization (CPU, memory, disks, network, users) in +a portable way by using Python 3, implementing many functionalities offered by +command line tools such as: ps, top, df, kill, free, lsof, free, netstat, +ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. + + +%prep +%autosetup -p0 -n %{srcname}-release-%{version} + +# Remove shebangs +find psutil -name \*.py | while read file; do + sed -i.orig -e '1{/^#!/d}' $file && \ + touch -r $file.orig $file && \ + rm $file.orig +done + + +%build +%py2_build +%py3_build + + +%install +%py2_install +%py3_install + + +#%check +# the main test target causes failures, investigating +#%if 0%{?fedora} < 32 +#make test-memleaks PYTHON=%{__python2} +#%endif +#make test-memleaks PYTHON=%{__python3} + + +%files -n python2-%{srcname} +%license LICENSE +%doc CREDITS HISTORY.rst README.rst +%{python2_sitearch}/%{srcname}/ +%{python2_sitearch}/*.egg-info + + +%files -n python%{python3_pkgversion}-%{srcname} +%license LICENSE +%doc CREDITS HISTORY.rst README.rst +%{python3_sitearch}/%{srcname}/ +%{python3_sitearch}/*.egg-info + + +%changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 22 2020 Nicolas Chauvet - 5.7.2-1 +- Update to 5.7.2 + +* Wed Jun 24 2020 Michel Alexandre Salim - 5.6.7-3 +- Add BR on setuptools for all package combinations + +* Sat May 23 2020 Miro Hrončok - 5.6.7-2 +- Rebuilt for Python 3.9 + +* Sun Feb 16 2020 Kevin Fenzi - 5.6.7-1 +- Update to 5.6.7. Fixes bug 1768362. + +* Thu Jan 30 2020 Fedora Release Engineering - 5.6.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Oct 06 2019 Kevin Fenzi - 5.6.3-5 +- Add python2-setuptools to BuildRequires to fix egg info. Fixes bug #1750362 + +* Tue Sep 03 2019 Miro Hrončok - 5.6.3-4 +- Reduce unused build dependencies + +* Fri Aug 16 2019 Miro Hrončok - 5.6.3-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 5.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 30 2019 Kevin Fenzi - 5.6.3-1 +- Update to 5.6.3 Fixes bug #1567102 + +* Thu Feb 28 2019 Yatin Karel - 5.5.1-1 +- Update to 5.5.1 (Resolves #1567102) + +* Sat Feb 02 2019 Fedora Release Engineering - 5.4.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 5.4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Jun 17 2018 Miro Hrončok - 5.4.3-5 +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 5.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 29 2018 Iryna Shcherbina - 5.4.3-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Mon Jan 22 2018 Gwyn Ciesla - 5.4.3-2 +- Disable tests entirely. + +* Mon Jan 22 2018 Gwyn Ciesla - 5.4.3-1 +- 5.4.3 + +* Thu Aug 03 2017 Fedora Release Engineering - 5.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 5.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sun Apr 23 2017 Kevin Fenzi - 5.2.2-1 +- Update to 5.2.2. Fixes bug #1441010 + +* Sat Mar 25 2017 Kevin Fenzi - 5.2.1-1 +- Update to 5.2.1. Fixes bug #1418489 + +* Sat Feb 25 2017 Kevin Fenzi - 5.1.3-1 +- Update to 5.1.3. Fixes bug #1418489 + +* Sat Feb 11 2017 Fedora Release Engineering - 5.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 02 2017 Kevin Fenzi - 5.0.1-1 +- Update to 5.0.1. Fixes bug #1389579 +- Disable failing test while upstream looks at it. + +* Wed Nov 09 2016 Kevin Fenzi - 5.0.0-1 +- Update to 5.0.0. Fixes bug #1389579 + +* Tue Oct 25 2016 Kevin Fenzi - 4.4.0-1 +- Update to 4.4.0. Fixes bug #1387942 + +* Sat Sep 03 2016 Kevin Fenzi - 4.3.1-1 +- Update to 4.3.1. Fixes bug #1372500 + +* Tue Jul 19 2016 Fedora Release Engineering - 4.3.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Tue Jun 21 2016 Orion Poplawski - 4.3.0-1 +- Update to 4.3.0 + +* Mon May 16 2016 Orion Poplawski - 3.2.1-6 +- Use modern provides filter +- Update URL +- Use %%python3_pkgversion for EPEL7 compat + +* Fri Mar 11 2016 Than Ngo - 3.2.1-5 +- fix endian issue on s390x/ppc64 + +* Thu Feb 04 2016 Fedora Release Engineering - 3.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Fri Sep 4 2015 Michel Alexandre Salim - 3.2.1-2 +- Add Obsoletes for old package + +* Fri Sep 4 2015 Michel Alexandre Salim - 3.2.1-1 +- Update to 3.2.1 +- Update to latest Python guidelines (https://fedorahosted.org/fpc/ticket/281) + +* Wed Jul 22 2015 Michel Alexandre Salim - 3.1.1-2 +- Restore *.so files +- Enable tests + +* Tue Jul 21 2015 Michel Alexandre Salim - 3.1.1-1 +- Update to 3.1.1 + +* Thu Jun 18 2015 Fedora Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Feb 18 2015 Ralph Bean - 2.2.0-1 +- new version + +* Wed Dec 3 2014 Michel Alexandre Salim - 2.1.3-1 +- Update to 2.1.3 + +* Sun Aug 17 2014 Fedora Release Engineering - 1.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 31 2014 Tom Callaway - 1.2.1-4 +- fix license handling + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 28 2014 Kalev Lember - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Mon Jan 06 2014 Mohamed El Morabity - 1.2.1-1 +- Update to 1.2.1 + +* Fri Aug 16 2013 Mohamed El Morabity - 1.0.1-1 +- Update to 1.0.1 + +* Sun Aug 04 2013 Fedora Release Engineering - 0.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun May 12 2013 Mohamed El Morabity - 0.7.1-1 +- Update to 0.7.1 + +* Thu Feb 14 2013 Fedora Release Engineering - 0.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Aug 19 2012 Mohamed El Morabity - 0.6.1-1 +- Update to 0.6.1 + +* Sat Aug 04 2012 David Malcolm - 0.5.1-3 +- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 + +* Sat Jul 21 2012 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jul 01 2012 Mohamed El Morabity - 0.5.1-1 +- Update to 0.5.1 + +* Sat Jan 14 2012 Fedora Release Engineering - 0.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Dec 16 2011 Mohamed El Morabity - 0.4.1-1 +- Update to 0.4.1 + +* Sun Nov 20 2011 Mohamed El Morabity - 0.4.0-1 +- Update to 0.4.0 + +* Mon Jul 18 2011 Mohamed El Morabity - 0.3.0-1 +- Update to 0.3.0 + +* Wed Mar 23 2011 Mohamed El Morabity - 0.2.1-1 +- Update to 0.2.1 +- Spec cleanup + +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Nov 22 2010 Mohamed El Morabity - 0.2.0-1 +- Update to 0.2.0 + +* Wed Aug 25 2010 Thomas Spura - 0.1.3-5 +- rebuild with python3.2 + http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html + +* Fri Jul 30 2010 Thomas Spura - 0.1.3-4 +- bump, because previous build nvr already existed in F-14 + +* Thu Jul 22 2010 David Malcolm - 0.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Apr 13 2010 ELMORABITY Mohamed 0.1.3-2 +- Add missing popd in %%build + +* Sat Mar 27 2010 ELMORABITY Mohamed 0.1.3-1 +- Update to 0.1.3 +- Remove useless call to 2to3 and corresponding BuildRequires + python2-tools (this version supports Python 3) + +* Sat Feb 20 2010 ELMORABITY Mohamed 0.1.2-4 +- Change python-utils BuildRequires for python2-utils + +* Sat Feb 20 2010 ELMORABITY Mohamed 0.1.2-3 +- Add python3 subpackage + +* Thu Jan 14 2010 ELMORABITY Mohamed 0.1.2-2 +- Drop no-shebang patch for a sed command +- Drop test suite from %%doc tag + +* Fri Jan 8 2010 ELMORABITY Mohamed 0.1.2-1 +- Initial RPM release diff --git a/sources b/sources new file mode 100644 index 0000000..23a7d04 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (psutil-5.7.2.tar.gz) = dc22b95aa5a816ffb3a30ff261cc8ce10eeca005e8602438ba6269816114d97cad7dbc55a0826838baba24d1b539b895d0a0c3fa86a10474df9a0266f03a26ea