Converted to setuptools.

Author: lehmannro

.gitignore

@@ -1,6 +1,9 @@
 MANIFEST
 build/
 dist/
+libleipzig.egg-info/
+nose-*.egg/
+suds-*.egg/
 manual.html
 .test/
 pip-log.txt

Makefile

@@ -1,28 +1,8 @@
-TESTDIR = ./.test
 PYTHON = python
-VIRTUALENV = virtualenv
-PYVER = $(shell $(PYTHON) -V 2>&1 | grep -o '[0-9].[0-9]')
-SOURCES = $(wildcard libleipzig/*.py) $(wildcard tests/*.py) \
-          README.rst setup.py
-.PHONY: install build dist test clean distclean virtualenv docs
+.PHONY: install build dist test clean distclean docs
 
-test: virtualenv
-	@cd $(TESTDIR); PYTHONPATH= \
-	./bin/nosetests --with-doctest --doctest-extension=rst --detailed-errors \
-	libleipzig.test ../README.rst
-
-virtualenv: $(TESTDIR) \
-	$(TESTDIR)/lib/python$(PYVER)/site-packages/suds \
-	$(TESTDIR)/lib/python$(PYVER)/site-packages/libleipzig \
-	$(TESTDIR)/bin/nosetests
-$(TESTDIR):
-	$(VIRTUALENV) --clear --no-site-packages --distribute "$(TESTDIR)"
-$(TESTDIR)/lib/python$(PYVER)/site-packages/suds:
-	$(TESTDIR)/bin/pip -q install suds
-$(TESTDIR)/lib/python$(PYVER)/site-packages/libleipzig: $(SOURCES)
-	$(TESTDIR)/bin/python setup.py --quiet install
-$(TESTDIR)/bin/nosetests:
-	$(TESTDIR)/bin/pip -q install nose
+test:
+	$(PYTHON) setup.py --quiet test --verbose
 
 install:
 	$(PYTHON) setup.py install
@@ -39,7 +19,8 @@ manual.html: README.rst libleipzig/protocol.py gendocs
 
 clean:
 	find . -name '*.py[co]' -exec rm -f {} ';'
-	rm -rf build/ dist/ "$(TESTDIR)"
+	rm -rf build/ dist/ libleipzig.egg-info/
+	rm -rf suds-*.egg/ nose-*.egg/
 	rm -f MANIFEST manual.html
 
 distclean: clean

libleipzig/__init__.py

@@ -1,7 +1,5 @@
 # Copyright (C) 2009, 2010 Robert Lehmann
 
-__version__ = "1.2.1"
-
 from libleipzig.protocol import *
 from libleipzig.transport import services
 from suds import WebFault

setup.py

@@ -1,21 +1,24 @@
 # Copyright (C) 2009, 2010 Robert Lehmann
 
-from distutils.core import setup
+from setuptools import setup
 import os.path
-import libleipzig
 
 setup(name='libleipzig',
-      version=libleipzig.__version__,
+      version='1.2.1',
       description="wortschatz.uni-leipzig.de binding",
       long_description=open(os.path.join(os.path.dirname(__file__),
           "README.rst")).read(),
       url="http://github.com/lehmannro/libleipzig-python/",
+      install_requires = ['suds'],
+      tests_require = ['nose'],
+      test_suite = "nose.collector",
       author="Robert Lehmann",
       author_email="libleipzig@robertlehmann.de",
       license="GPLv3",
       packages=['libleipzig', 'libleipzig.test'],
       package_dir={'libleipzig.test': "tests"},
       package_data={'libleipzig': ["README.rst", "manual.html"]},
+      zip_safe=True,
       classifiers=[
           'Environment :: Web Environment',
           'License :: OSI Approved :: GNU General Public License (GPL)',