summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-09-06 06:12:08 +0900
committerkali <kali@leap.se>2012-09-06 06:12:28 +0900
commit212f9588e458d5c864134caa8dafbef164631671 (patch)
tree5fc8f531f54d0f4fe83a2298827e74a03bc296f6 /setup.py
parent877c98a0add6fb3bce3e503098d120377012f6ec (diff)
bootstrap setuptools + version fix
also test_requires using parse_requirements
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py19
1 files changed, 5 insertions, 14 deletions
diff --git a/setup.py b/setup.py
index 19df86e3..1e265cd5 100755
--- a/setup.py
+++ b/setup.py
@@ -6,12 +6,8 @@ import sys
try:
from setuptools import setup, find_packages
except ImportError:
- #FIXME old?
- #use distribute_setup instead??
- #http://packages.python.org/distribute/setuptools.html#using-setuptools-without-bundling-it
- import ez_setup
- #XXX move ez_setup somewhere else?
- ez_setup.use_setuptools()
+ from pkg import distribute_setup
+ distribute_setup.use_setuptools()
from setuptools import setup, find_packages
import os
@@ -57,13 +53,8 @@ setup(
classifiers=trove_classifiers,
install_requires=utils.parse_requirements(),
test_suite='nose.collector',
-
- # XXX change to parse_test_requirements and
- # get them from pip reqs.
- test_requires=[
- "nose",
- "mock"],
-
+ test_requires=utils.parse_requirements(
+ reqfiles=['pkg/test-requirements.pip']),
keywords='leap, client, qt, encryption, proxy',
author='The LEAP project',
author_email='info@leap.se',
@@ -75,7 +66,7 @@ setup(
include_package_data=True,
zip_safe=False,
- # XXX platform switch
+ # add platform switch
data_files=[
("share/man/man1",
["docs/leap.1"]),