diff options
| author | Nicolas Hennion <nicolashennion@gmail.com> | 2013-02-22 00:08:28 -0800 |
|---|---|---|
| committer | Nicolas Hennion <nicolashennion@gmail.com> | 2013-02-22 00:08:28 -0800 |
| commit | a1cad521342c6f73607e55630b33c24f1623cec8 (patch) | |
| tree | 427729c6b21dabd6554e2a6bddd33aa24dccb90b | |
| parent | f42cea07ad7c4471e38c596e6decf20e55c9038b (diff) | |
| parent | e5f9c9223f7e3091455f9ba79a4e7ce5dfcf3cad (diff) | |
Merge pull request #185 from asergi/master
Fix Travis-CI issue
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | glances/tests/__init__.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | glances/tests/test_glances.py (renamed from glances/unitest.py) | 15 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rwxr-xr-x | setup.py | 1 |
6 files changed, 11 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index cc7c7a7a..dafc1685 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ python: - "2.6" - "2.7" - "3.2" + - "3.3" install: - - "pip install psutil" -script: cd ./glances ; python ./unitest.py + - pip install -r requirements.txt --use-mirrors +script: python setup.py install diff --git a/MANIFEST.in b/MANIFEST.in index 826d9633..36c36cd4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,6 @@ include README include COPYING include AUTHORS -include ChangeLog include NEWS include screenshot.png recursive-include doc *.png diff --git a/glances/tests/__init__.py b/glances/tests/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/glances/tests/__init__.py diff --git a/glances/unitest.py b/glances/tests/test_glances.py index 4e6621da..a2f2ffca 100755..100644 --- a/glances/unitest.py +++ b/glances/tests/test_glances.py @@ -3,11 +3,6 @@ # # Glances unitary test # -# Syntax: -# ./unitest.py -# or -# ./unitest.py -v -# # Copyright (C) 2012 Nicolargo <nicolas@nicolargo.com> # # Glances is free software; you can redistribute it and/or modify @@ -23,12 +18,14 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +# import os +# import time +# import signal import unittest import multiprocessing -import os -import signal -import time -import glances + +from glances import glances + class TestGlancesStat(unittest.TestCase): diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..c02dd913 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +psutil==0.6.1 @@ -40,6 +40,7 @@ setup( license="LGPL", keywords="cli curses monitoring system", long_description=open('README').read(), + test_suite="glances.tests", install_requires=['psutil>=0.4.1'], packages=['glances'], extras_require={ |