* made setuptools an optional dependency

* bumped version to 0.4.5

3 files changed, 18 insertions, 8 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 2565f68..e68b105 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+0.4.5 (2012-01-06)
+------------------
+
+- made setuptools dependency optional
+
 0.4.4 (2011-04-16)
 ------------------
 
diff --git a/README.txt b/README.txt
index ce2d2c2..9c789c2 100644
--- a/README.txt
+++ b/README.txt
@@ -73,7 +73,9 @@ Installation:
 -------------
 
 This module can easily be installed with Python standard installation methods.
-Just use *setuptools* or *easy_install* as usual.
+
+Either use *python setup.py install* or in case you have *setuptools* or
+*distribute* available, you can also use *easy_install*.
 
 Limitations:
 ------------
diff --git a/setup.py b/setup.py
index 9bf49ca..f565c3b 100644
--- a/setup.py
+++ b/setup.py
@@ -26,18 +26,21 @@
 # CONTRACT, STRICT LIABILITY, OR TORT
 ##############################################################################
 import os
-from setuptools import setup
-from setuptools import find_packages
-# for setuptools see: http://peak.telecommunity.com/DevCenter/setuptools
 
+setupargs = {}
+
+try:
+    from setuptools import setup
+    setupargs['test_suite'] = 'tests.test_suite'
+except ImportError:
+    from distutils.core import setup
 
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-
 setup(name='isodate',
-      version='0.4.4',
-      packages=find_packages('src', exclude=["tests"]),
+      version='0.4.5',
+      packages=['isodate',],
       package_dir={'': 'src'},
 
       # dependencies:
@@ -64,5 +67,5 @@ setup(name='isodate',
                    'Topic :: Internet',
                    'Topic :: Software Development :: Libraries :: Python Modules',
                    ],
-      test_suite="tests.test_suite"
+      **setupargs
      )