diff options
author | Nicolargo <nicolas@nicolargo.com> | 2017-02-07 13:17:46 +0100 |
---|---|---|
committer | Nicolargo <nicolas@nicolargo.com> | 2017-02-07 13:17:46 +0100 |
commit | b81ac02242d801932cc7ac7a3bb3a8a1fb6d0b4a (patch) | |
tree | 2213e02c7964d700bc995facd966437363279fea | |
parent | b38def991cc631b063873124c883a883888fc185 (diff) | |
parent | f468367522c567ea6badac91cce80092244bb7a5 (diff) |
Merge branch 'develop' of https://github.com/nicolargo/glances into develop
-rw-r--r-- | README.rst | 2 | ||||
-rw-r--r-- | optional-requirements.txt | 2 | ||||
-rwxr-xr-x | setup.py | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -61,7 +61,7 @@ Optional dependencies: - ``influxdb`` (for the InfluxDB export module) - ``matplotlib`` (for graphical/chart support) - ``netifaces`` (for the IP plugin) -- ``nvidia-ml-py`` (for the GPU plugin) +- ``nvidia-ml-py`` (for the GPU plugin) [Python 2-only] - ``pika`` (for the RabbitMQ/ActiveMQ export module) - ``potsdb`` (for the OpenTSDB export module) - ``py3sensors`` (for hardware monitoring support) [Linux-only] diff --git a/optional-requirements.txt b/optional-requirements.txt index 926c046a..869343a7 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -8,7 +8,7 @@ elasticsearch influxdb matplotlib netifaces -nvidia-ml-py +nvidia-ml-py; python_version == "2.7" pika potsdb py-cpuinfo @@ -87,7 +87,7 @@ setup( 'export': ['bernhard', 'cassandra-driver', 'couchdb', 'elasticsearch', 'influxdb>=1.0.0', 'pika', 'potsdb', 'pyzmq', 'statsd'], 'folders:python_version<"3.5"': ['scandir'], - 'gpu': ['nvidia-ml-py'], + 'gpu:python_version=="2.7"': ['nvidia-ml-py'], 'ip': ['netifaces'], 'raid': ['pymdstat'], 'snmp': ['pysnmp'], |