Accepting request 764194 from home:mcalabkova:branches:devel:languages:python
- update to 3.1.3 * Add a new TCP connections status plugin enhancement * Add --enable-plugin option from the command line * Fix custom refresh time in the web UI * Fix issue in WebUI with empty docker stats * Glances fails without network interface bug fixed * Disable option in the configuration file is now take into account * Sensors plugin is disable by default (high CPU consumption on some Linux distribution). - added upstream patch fix-unittest.patch to fix tests OBS-URL: https://build.opensuse.org/request/show/764194 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Glances?expand=0&rev=12
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
cc8ec794c4
commit
08a04ea974
28
fix-unittest.patch
Normal file
28
fix-unittest.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 793552ea864c9220a578ee5e610ebb85c05728c9 Mon Sep 17 00:00:00 2001
|
||||
From: nicolargo <nicolas@nicolargo.com>
|
||||
Date: Sat, 12 Oct 2019 11:45:36 +0200
|
||||
Subject: [PATCH] Correct unitest
|
||||
|
||||
---
|
||||
glances/plugins/glances_plugin.py | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py
|
||||
index 6a1c8606..23a76f80 100644
|
||||
--- a/glances/plugins/glances_plugin.py
|
||||
+++ b/glances/plugins/glances_plugin.py
|
||||
@@ -86,10 +86,11 @@ def __init__(self,
|
||||
self.stats_history = self.init_stats_history()
|
||||
|
||||
# Init the limits (configuration keys) dictionnary
|
||||
- logger.debug('Load section {} in {}'.format(self.plugin_name,
|
||||
- config.config_file_paths()))
|
||||
self._limits = dict()
|
||||
- self.load_limits(config=config)
|
||||
+ if config is not None:
|
||||
+ logger.debug('Load section {} in {}'.format(self.plugin_name,
|
||||
+ config.config_file_paths()))
|
||||
+ self.load_limits(config=config)
|
||||
|
||||
# Init the actions
|
||||
self.actions = GlancesActions(args=args)
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 13 16:58:18 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
|
||||
|
||||
- update to 3.1.3
|
||||
* Add a new TCP connections status plugin enhancement
|
||||
* Add --enable-plugin option from the command line
|
||||
* Fix custom refresh time in the web UI
|
||||
* Fix issue in WebUI with empty docker stats
|
||||
* Glances fails without network interface bug fixed
|
||||
* Disable option in the configuration file is now take into account
|
||||
* Sensors plugin is disable by default (high CPU consumption on some Linux distribution).
|
||||
- added upstream patch fix-unittest.patch to fix tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 6 21:27:25 CEST 2019 - Matej Cepl <mcepl@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-Glances
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||
Name: python-Glances
|
||||
Version: 3.1.2
|
||||
Version: 3.1.3
|
||||
Release: 0
|
||||
Summary: A cross-platform curses-based monitoring tool
|
||||
License: LGPL-3.0-only
|
||||
@ -27,21 +27,20 @@ Source: https://github.com/nicolargo/glances/archive/v%{version}.tar.gz
|
||||
Patch0: adjust-data-files.patch
|
||||
Patch1: remove-shebang.patch
|
||||
Patch2: skip-online-tests.patch
|
||||
#PATCH-FIX-UPSTREAM https://github.com/nicolargo/glances/commit/793552ea864c9220a578ee5e610ebb85c05728c9 Correct unitest
|
||||
Patch3: fix-unittest.patch
|
||||
BuildRequires: %{python_module bottle}
|
||||
BuildRequires: %{python_module curses}
|
||||
BuildRequires: %{python_module future}
|
||||
BuildRequires: %{python_module netifaces}
|
||||
BuildRequires: %{python_module nose}
|
||||
BuildRequires: %{python_module psutil >= 5.3.0}
|
||||
BuildRequires: %{python_module psutil >= 5.6.3}
|
||||
BuildRequires: %{python_module requests}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
Requires: python-bottle
|
||||
Requires: python-curses
|
||||
Requires: python-future
|
||||
Requires: python-psutil >= 5.6.3
|
||||
Requires: python-requests
|
||||
Recommends: python-curses
|
||||
Provides: python-glances = %{version}
|
||||
Obsoletes: python-glances < %{version}
|
||||
BuildArch: noarch
|
||||
@ -63,17 +62,16 @@ size of the user interface.
|
||||
%build
|
||||
%python_build
|
||||
|
||||
# tests are failing on upstream, they apparently don't mind
|
||||
%install
|
||||
%python_install
|
||||
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
||||
|
||||
%check
|
||||
export LANG=en_US.UTF-8
|
||||
%python_exec unitest.py
|
||||
%python_exec unitest-restful.py
|
||||
%python_exec unitest-xmlrpc.py
|
||||
|
||||
%install
|
||||
%python_install
|
||||
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
||||
|
||||
%files %{python_files}
|
||||
%license COPYING
|
||||
%doc NEWS.rst README.rst
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:adda21ceaff7a04b18b0f71f2dbfcc1647bd0aa888d12f61f1e03f4f60216a12
|
||||
size 6740649
|
||||
3
v3.1.3.tar.gz
Normal file
3
v3.1.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e3e8f9362b82c74427522e82501b47696945251035b35282f9ee4bc533996220
|
||||
size 6759527
|
||||
Loading…
x
Reference in New Issue
Block a user