Merge branch 'develop' of https://github.com/nicolargo/glances into d…

…evelop
nicolargo · Feb 7, 2017 · b81ac02 · b81ac02
2 parents b38def9 + f468367
commit b81ac02
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.rst b/README.rst
@@ -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
@@ -8,7 +8,7 @@ elasticsearch
 influxdb
 matplotlib
 netifaces
-nvidia-ml-py
+nvidia-ml-py; python_version == "2.7"
 pika
 potsdb
 py-cpuinfo

diff --git a/setup.py b/setup.py
@@ -87,7 +87,7 @@ def run(self):
         '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'],