summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessio Sergi <al3hex@gmail.com>2014-05-11 17:11:17 +0200
committerAlessio Sergi <al3hex@gmail.com>2014-05-11 17:11:17 +0200
commitb6339ed76dee2d03ee5d1c8b6c2731ec52f0be9f (patch)
treed8c06256bea6fed4462303bcf58008c2cabfb43b
parent535793da058b607c92c73b84cf470377d8dd5b59 (diff)
Small fixes and improvements
README.rst: Add Slackware http://slackbuilds.org/repository/14.1/system/glances/
-rw-r--r--AUTHORS2
-rw-r--r--README.rst12
-rwxr-xr-xsetup.py10
3 files changed, 12 insertions, 12 deletions
diff --git a/AUTHORS b/AUTHORS
index 5e2dbb8e..b8784100 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,7 +7,7 @@ http://blog.nicolargo.com
https://twitter.com/nicolargo
contact@nicolargo.com
-Alessio Sergi (aka) Al3hex
+Alessio Sergi (aka) al3hex
https://twitter.com/al3hex
Brandon Philips (aka) Philips
diff --git a/README.rst b/README.rst
index 1efab503..94a9456f 100644
--- a/README.rst
+++ b/README.rst
@@ -48,9 +48,11 @@ Glances is on `PyPI`_. To install, simply use `pip`_:
.. code-block:: console
- apt-get install python-dev
pip install Glances
+*Note*: Python headers are required to install psutil.
+For example, on Debian/Ubuntu you need to install first the *python-dev* package.
+
To upgrade Glances to the latest version:
.. code-block:: console
@@ -66,6 +68,7 @@ At the moment, packages exist for the following distributions:
- Debian (Testing/Sid)
- Fedora/CentOS/RHEL
- Gentoo
+- Slackware
- Ubuntu (13.04+)
- Void Linux
@@ -142,11 +145,8 @@ To install Glances from source:
$ cd glances-*
# python setup.py install
-*Note*: Python headers are required to install psutil. For example, you need to install first:
-
-* On Debian/Ubuntu, the *python-dev* package
-* On CentOS/Fedora, the *python-devel* package (from the EPEL repository)
-* On openSUSE/SLES/SLED, the *python-devel* package (from Oss repository)
+*Note*: Python headers are required to install psutil.
+For example, on Debian/Ubuntu you need to install first the *python-dev* package.
Puppet
------
diff --git a/setup.py b/setup.py
index 1fe0f979..c09ae40e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
+import glob
import os
import sys
-import glob
from setuptools import setup
@@ -26,10 +26,9 @@ data_files.append((conf_path, ['conf/glances.conf']))
for mo in glob.glob('i18n/*/LC_MESSAGES/*.mo'):
data_files.append((os.path.dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
+requires = ['psutil>=0.5.1']
if sys.platform.startswith('win'):
- requires = ['psutil>=0.5.1', 'colorconsole==0.6']
-else:
- requires = ['psutil>=0.5.1']
+ requires += ['colorconsole']
setup(
name='Glances',
@@ -66,6 +65,7 @@ setup(
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
- 'Programming Language :: Python :: 3.3'
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4'
]
)