From 282335d519f8d15b956abf19aff143679a715a87 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 16 Aug 2013 14:56:00 +0200 Subject: [PATCH] Bump minimum required psutil version to 0.5.1 --- glances/glances.py | 12 ++++-------- setup.py | 8 ++++---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/glances/glances.py b/glances/glances.py index 9085bee0..f8f9d987 100644 --- a/glances/glances.py +++ b/glances/glances.py @@ -96,9 +96,10 @@ except ImportError: sys.exit(1) psutil_version = tuple([int(num) for num in psutil.__version__.split('.')]) -if psutil_version < (0, 4, 1): +# this is not a mistake: psutil 0.5.1 is detected as 0.5.0 +if psutil_version < (0, 5, 0): print(_('PsUtil version %s detected.') % psutil.__version__) - print(_('PsUtil 0.4.1 or higher is needed. Glances cannot start.')) + print(_('PsUtil 0.5.1 or higher is needed. Glances cannot start.')) sys.exit(1) try: @@ -995,12 +996,7 @@ class GlancesGrabProcesses: procstat['status'] = str(proc.status)[:1].upper() procstat['cpu_times'] = proc.get_cpu_times() procstat['cpu_percent'] = proc.get_cpu_percent(interval=0) - - if hasattr(proc, 'get_nice'): - # deprecated in psutil 0.5.0+ - procstat['nice'] = proc.get_nice() - elif hasattr(proc, 'nice'): - procstat['nice'] = proc.nice + procstat['nice'] = proc.get_nice() # procstat['io_counters'] is a list: # [read_bytes, write_bytes, read_bytes_old, write_bytes_old, io_tag] diff --git a/setup.py b/setup.py index b697e849..342dde81 100755 --- a/setup.py +++ b/setup.py @@ -39,11 +39,11 @@ setup( # download_url='https://s3.amazonaws.com/glances/glances-1.7.1.tar.gz', license="LGPL", keywords="cli curses monitoring system", - install_requires=['psutil>=0.4.1'], + install_requires=['psutil>=0.5.1'], extras_require={ - 'HTML': ['jinja2>=2.0'], - 'SENSORS': ['pysensors>=0.0.2'], - 'BATINFO': ['batinfo>=0.1.3'] + 'HTML': ['jinja2'], + 'SENSORS': ['pysensors'], + 'BATINFO': ['batinfo'] }, packages=['glances'], include_package_data=True, -- GitLab