From 1e0cd5784eee4dc3ae7b5b6c8b8f9b82fda1f5c7 Mon Sep 17 00:00:00 2001
From: fawce <fawcett@gmail.com>
Date: Wed, 8 Feb 2012 16:14:10 -0500
Subject: [PATCH] added distutils tasks to paver

---
 etc/jenkins.sh | 6 +++---
 pavement.py    | 3 +++
 setup.py       | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/etc/jenkins.sh b/etc/jenkins.sh
index 9c9bc4cc..184357bc 100755
--- a/etc/jenkins.sh
+++ b/etc/jenkins.sh
@@ -11,15 +11,15 @@ source /usr/local/bin/virtualenvwrapper.sh
 #create the scientific python virtualenv and copy to provide qsim base
 mkvirtualenv --no-site-packages scientific_base
 workon scientific_base
-./scripts/ordered_pip.sh ./scripts/requirements_sci.txt
+./etc/ordered_pip.sh ./etc/requirements_sci.txt
 deactivate
 #re-base qsim
 #rmvirtualenv qsim
 cpvirtualenv scientific_base qsim  
 
 workon qsim
-./scripts/ordered_pip.sh ./scripts/requirements.txt
-./scripts/ordered_pip.sh ./scripts/requirements_dev.txt
+./etc/ordered_pip.sh ./etc/requirements.txt
+./etc/ordered_pip.sh ./etc/requirements_dev.txt
 
 #run all the tests in test
 nosetests --with-xcoverage --with-xunit --cover-erase --cover-package=qsim
diff --git a/pavement.py b/pavement.py
index c892ab94..9cd57852 100644
--- a/pavement.py
+++ b/pavement.py
@@ -13,6 +13,9 @@ from paved import *
 from paved.util import *
 from paved.pycheck import *
 
+#add setuputils tasks
+paver.setuputils.install_distutils_tasks()
+
 operating_system = platform.system()
 
 # ===========
diff --git a/setup.py b/setup.py
index d0413580..f3fbd848 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,6 @@
 import os
+from setuptools import setup, find_packages
+
 if os.path.exists("paver-minilib.zip"):
     import sys
     sys.path.insert(0, "paver-minilib.zip")