Merge lp:~le-chi-thu/lava-test/use-setuptools into lp:lava-test/0.0

[Le Chi Thu]

use setuptools instead of DistUtilsExtra

[Zygmunt Krynicki (zyga)]

Looks good!

+1

review: Approve

[Paul Larson (pwlars)]

89 + "License :: OSI Approved :: GNU Affero General Public License v3",
90 + "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
Since when is lava-test agpl3 & LGPL?

review: Needs Fixing

[lp:~le-chi-thu/lava-test/use-setuptools]

73. By Le Chi Thu <email address hidden> <email address hidden> on 2011-06-22

Updated license info

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-04-16 13:13:04 +0000
+++ .bzrignore	2011-06-22 19:02:10 +0000
@@ -1,5 +1,7 @@
 .idea
 .testrepository
+dist
+lava_test.egg-info
 *~
 *.tmp
 *.py[co]

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2011-06-22 19:02:10 +0000
@@ -0,0 +1,4 @@
+include COPYING
+include README
+include .testr.conf
+include bin/lava-test
\ No newline at end of file

=== modified file 'README'
--- README	2011-06-10 04:49:54 +0000
+++ README	2011-06-22 19:02:10 +0000
@@ -2,3 +2,10 @@
 ability to define additional tests as needed.  Tests can be
 automatically installed, executed, and the results can be parsed and
 uploaded to an external server.
+
+External dependency
+-------------------
+The following debian packages are needed:
+* python-apt
+* usbutils
+* python-testrepository - for running unit tests
\ No newline at end of file

=== modified file 'setup.py'
--- setup.py	2011-06-10 04:49:54 +0000
+++ setup.py	2011-06-22 19:02:10 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2010 Linaro
+# Copyright (c) 2010, 2011 Linaro
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,22 +15,34 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from setuptools import setup, find_packages
 from abrek import __version__ as version
-import sys
 
-try:
-    from DistUtilsExtra.auto import setup
-except ImportError:
-    print >> sys.stderr, 'To build lava-test you need', \
-                         'https://launchpad.net/python-distutils-extra'
-    sys.exit(1)
 
 setup(
-name='lava-test',
-version=version,
-author='Paul Larson',
-author_email='[e-mail]',
-url='https://launchpad.net/lava-test',
-description='Lava test execution framework',
-long_description=open("README").read() + "\n",
-)
+    name='lava-test',
+    version=version,
+    author='Paul Larson',
+    author_email='[e-mail]',
+    url='https://launchpad.net/lava-test',
+    description='Lava test execution framework',
+    long_description=open("README").read(),
+    packages=find_packages(),
+    #packages = ['lava_test', 'lava_test.test_definitions'],
+    license="GPL3",
+    test_suite='tests.test_suite',
+    scripts = ['bin/lava-test'],
+    classifiers=[
+        "Development Status :: 3 - Alpha",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: GNU General Public License, version 3",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 2.6",
+        "Topic :: Software Development :: Testing",
+    ],
+    install_requires = [
+        "linaro-dashboard-bundle",
+    ],
+    zip_safe=False,
+    include_package_data=True)
+