Hello community,
here is the log from the commit of package python-Glances for openSUSE:Factory
checked in at 2020-05-08 23:06:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Glances (Old)
and /work/SRC/openSUSE:Factory/.python-Glances.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Glances"
Fri May 8 23:06:41 2020 rev:8 rq:801235 version:3.1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Glances/python-Glances.changes
2020-03-26 23:35:22.810820667 +0100
+++ /work/SRC/openSUSE:Factory/.python-Glances.new.2738/python-Glances.changes
2020-05-08 23:06:44.402032416 +0200
@@ -1,0 +2,7 @@
+Wed May 6 18:46:52 UTC 2020 - Martin Hauke <mar...@gmx.de>
+
+- Drop python2
+- Add patch:
+ * fix-tests.patch
+
+-------------------------------------------------------------------
New:
----
fix-tests.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Glances.spec ++++++
--- /var/tmp/diff_new_pack.gtS6iL/_old 2020-05-08 23:06:45.522034704 +0200
+++ /var/tmp/diff_new_pack.gtS6iL/_new 2020-05-08 23:06:45.526034713 +0200
@@ -17,6 +17,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
Name: python-Glances
Version: 3.1.4.1
Release: 0
@@ -27,6 +28,7 @@
Patch0: adjust-data-files.patch
Patch1: remove-shebang.patch
Patch2: skip-online-tests.patch
+Patch3: fix-tests.patch
BuildRequires: %{python_module bottle}
BuildRequires: %{python_module future}
BuildRequires: %{python_module psutil >= 5.6.3}
@@ -42,9 +44,7 @@
Provides: python-glances = %{version}
Obsoletes: python-glances < %{version}
BuildArch: noarch
-%ifpython3
Provides: glances
-%endif
%python_subpackages
%description
++++++ fix-tests.patch ++++++
diff --git a/unitest-restful.py b/unitest-restful.py
index 7b77a2b..5f991bd 100755
--- a/unitest-restful.py
+++ b/unitest-restful.py
@@ -22,6 +22,7 @@
import shlex
import subprocess
+import sys
import time
import numbers
import unittest
@@ -64,7 +65,7 @@ class TestGlances(unittest.TestCase):
global pid
print('INFO: [TEST_000] Start the Glances Web Server')
- cmdline = "python -m glances -w -p %s" % SERVER_PORT
+ cmdline = "%s -m glances -w -p %s" % (sys.executable, SERVER_PORT)
print("Run the Glances Web Server on port %s" % SERVER_PORT)
args = shlex.split(cmdline)
pid = subprocess.Popen(args)
diff --git a/unitest-xmlrpc.py b/unitest-xmlrpc.py
index 7e52ec5..384fa46 100755
--- a/unitest-xmlrpc.py
+++ b/unitest-xmlrpc.py
@@ -23,6 +23,7 @@
import json
import shlex
import subprocess
+import sys
import time
import unittest
@@ -53,7 +54,7 @@ class TestGlances(unittest.TestCase):
global pid
print('INFO: [TEST_000] Start the Glances Web Server')
- cmdline = "python -m glances -s -p %s" % SERVER_PORT
+ cmdline = "%s -m glances -s -p %s" % (sys.executable, SERVER_PORT)
print("Run the Glances Server on port %s" % SERVER_PORT)
args = shlex.split(cmdline)
pid = subprocess.Popen(args)
