diff --git a/NEWS b/NEWS index 624cf682..30944f89 100644 --- a/NEWS +++ b/NEWS @@ -5,9 +5,13 @@ Glances Version 2 Version 2.x ============= -Bugs corrected: +Enhancements and new features: * Use new sensors-related APIs of Psutil 5.1.0 (issue #1018) + => Remove Py3Sensors and Batinfo dependencies + +Bugs corrected: + * Unable to launch Glances on Windows (issue #1021) Version 2.8.2 diff --git a/README.rst b/README.rst index 73c42a7d..6055e200 100644 --- a/README.rst +++ b/README.rst @@ -50,7 +50,6 @@ Requirements Optional dependencies: -- ``batinfo`` (for battery monitoring support) [Linux-only] - ``bernhard`` (for the Riemann export module) - ``bottle`` (for Web server mode) - ``cassandra-driver`` (for the Cassandra export module) @@ -135,7 +134,7 @@ features (like the Web interface, exports modules...): .. code-block:: console - pip install glances[action,batinfo,browser,cpuinfo,chart,docker,export,folders,gpu,ip,raid,snmp,web,wifi] + pip install glances[action,browser,cpuinfo,chart,docker,export,folders,gpu,ip,raid,snmp,web,wifi] To upgrade Glances to the latest version: diff --git a/docs/aoa/sensors.rst b/docs/aoa/sensors.rst index d2d459ea..4b2aaaef 100644 --- a/docs/aoa/sensors.rst +++ b/docs/aoa/sensors.rst @@ -7,10 +7,7 @@ Sensors .. image:: ../_static/sensors.png -Glances can displays the sensors information using ``lm-sensors``, -``hddtemp`` and `batinfo`_. - -All of the above libraries are available only on Linux. +Glances can displays the sensors information using ``PsUtil`` and ``hddtemp``. As of ``lm-sensors``, a filter is being applied in order to display temperature and fan speed only. @@ -20,5 +17,3 @@ There is no alert on this information. .. note:: Limit values and sensors alias names can be defined in the configuration file under the ``[sensors]`` section. - -.. _batinfo: https://github.com/nicolargo/batinfo diff --git a/docs/man/glances.1 b/docs/man/glances.1 index aa8355e4..4f2dd2ec 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GLANCES" "1" "Feb 07, 2017" "2.8.2" "Glances" +.TH "GLANCES" "1" "Feb 11, 2017" "2.8.3_DEVELOP" "Glances" .SH NAME glances \- An eye on your system . diff --git a/optional-requirements.txt b/optional-requirements.txt index d7555fe4..61527d31 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -1,4 +1,3 @@ -batinfo bernhard bottle cassandra-driver diff --git a/setup.py b/setup.py index 3069aaf4..7eab9392 100755 --- a/setup.py +++ b/setup.py @@ -79,7 +79,6 @@ setup( install_requires=get_install_requires(), extras_require={ 'action': ['pystache'], - 'batinfo': ['batinfo'], 'browser': ['zeroconf>=0.17'], 'cpuinfo': ['py-cpuinfo'], 'chart': ['matplotlib'], diff --git a/tox.ini b/tox.ini index 3c54c1d2..daa48306 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,6 @@ deps = requests psutil bottle - batinfo commands = python unitest.py python unitest-restful.py