From f88d8f53c07a31d5a389ecd910faf0dcea53d474 Mon Sep 17 00:00:00 2001 From: Nicolas Hennion Date: Tue, 25 Mar 2014 20:03:54 +0100 Subject: version 1.7.6 --- NEWS | 8 ++++++++ README.rst | 2 +- docs/glances-doc.html | 6 ++++-- docs/glances-doc.rst | 4 ++-- docs/index.rst | 22 ++++++++-------------- glances/glances.py | 4 ++-- man/glances.1 | 2 +- setup.py | 4 ++-- 8 files changed, 28 insertions(+), 24 deletions(-) diff --git a/NEWS b/NEWS index 12ec37de..40f34349 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +Version 1.7.6 +============= + + * Adapt to psutil 2.0.0 API + * Fixed psutil 0.5.x support on Windows + * Fix help screen in 80x24 terminal size + * Implement toggle of process list display ('z' key) + Version 1.7.5 ============= diff --git a/README.rst b/README.rst index f1fa6f28..1e07f09d 100644 --- a/README.rst +++ b/README.rst @@ -28,7 +28,7 @@ Requirements ============ - ``python >= 2.6`` (tested with version 2.6, 2.7, 3.2, 3.3) -- ``psutil >= 0.5.1`` (recommended version >= 1.2.1) +- ``psutil >= 0.5.1`` (recommended version >= 2.0) - ``setuptools`` Optional dependencies: diff --git a/docs/glances-doc.html b/docs/glances-doc.html index d2c1b425..f1476601 100644 --- a/docs/glances-doc.html +++ b/docs/glances-doc.html @@ -123,9 +123,9 @@ td.option-group {

Glances

-

This manual describes Glances version 1.7.5.

+

This manual describes Glances version 1.7.6.

Copyright © 2012-2014 Nicolas Hennion <nicolas@nicolargo.com>

-

January 2014

+

March 2014

Table of Contents

    @@ -324,6 +324,8 @@ just run on the server:

    Delete finished warning and critical log messages
    y
    Show/hide hddtemp stats (only available with -y flag)
    +
    z
    +
    Show/hide processes list (for low CPU consumption)
    1
    Switch between global CPU and per-CPU stats
    diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst index a3fbf2a9..3ea77b44 100644 --- a/docs/glances-doc.rst +++ b/docs/glances-doc.rst @@ -2,11 +2,11 @@ Glances ======= -This manual describes *Glances* version 1.7.5. +This manual describes *Glances* version 1.7.6. Copyright © 2012-2014 Nicolas Hennion -January 2014 +March 2014 .. contents:: Table of Contents diff --git a/docs/index.rst b/docs/index.rst index b03349f3..a6224ffe 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,24 +1,17 @@ +.. Glances documentation master file, created by + sphinx-quickstart on Tue Mar 25 19:57:21 2014. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + Welcome to Glances's documentation! =================================== -**Glances** is a cross-platform curses-based monitoring tool written in Python. - -It uses the psutil library and some internal code to get information from your system. - -.. image:: https://raw.github.com/nicolargo/glances/master/docs/images/screenshot-wide.png - -Get the code ------------- - -The `source `_ is available on GitHub. - -Contents --------- +Contents: .. toctree:: :maxdepth: 2 - glances-doc + Indices and tables ================== @@ -26,3 +19,4 @@ Indices and tables * :ref:`genindex` * :ref:`modindex` * :ref:`search` + diff --git a/glances/glances.py b/glances/glances.py index cef32811..d173c6a7 100644 --- a/glances/glances.py +++ b/glances/glances.py @@ -19,7 +19,7 @@ # along with this program. If not, see . __appname__ = 'glances' -__version__ = "1.7.5" +__version__ = "1.7.6" __author__ = "Nicolas Hennion " __licence__ = "LGPL" @@ -903,7 +903,7 @@ class glancesLogs: if item_type.startswith("MEM"): # Sort TOP process by memory_percent sortby = 'memory_percent' - elif item_type.startswith("CPU IO") and is_Linux: + elif item_type.startswith("CPU_IO") and is_Linux: # Sort TOP process by io_counters (only for Linux OS) sortby = 'io_counters' elif item_type.startswith("MON"): diff --git a/man/glances.1 b/man/glances.1 index 120c9110..6f577e5b 100644 --- a/man/glances.1 +++ b/man/glances.1 @@ -1,4 +1,4 @@ -.TH glances 1 "March, 2014" "version 1.7.5" "USER COMMANDS" +.TH glances 1 "March, 2014" "version 1.7.6" "USER COMMANDS" .SH NAME glances \- A cross-platform curses-based monitoring tool .SH SYNOPSIS diff --git a/setup.py b/setup.py index 5c0d2702..1fe0f979 100755 --- a/setup.py +++ b/setup.py @@ -33,13 +33,13 @@ else: setup( name='Glances', - version='1.7.5', + version='1.7.6', description="A cross-platform curses-based monitoring tool", long_description=open('README.rst').read(), author='Nicolas Hennion', author_email='nicolas@nicolargo.com', url='https://github.com/nicolargo/glances', - # download_url='https://s3.amazonaws.com/glances/glances-1.7.5.tar.gz', + # download_url='https://s3.amazonaws.com/glances/glances-1.7.6.tar.gz', license="LGPL", keywords="cli curses monitoring system", install_requires=requires, -- cgit v1.2.3