Changeset 1614

Timestamp:

02/11/10 09:08:51 (6 months ago)

Author:

mturk

Message:

Moving to distribute from setuptools.

Location:

trunk

Files:

• distribute_setup.py (added)
• doc/install_script.sh (modified) (3 diffs)
• ez_setup.py (deleted)
• setup.py (modified) (2 diffs)

trunk/doc/install_script.sh

@@ -311 +311 @@
 
 echo "Installing setuptools"
-( ${DEST_DIR}/bin/python2.6 ${YT_DIR}/ez_setup.py 2>&1 ) 1>> ${LOG_FILE} || do_exit
+( ${DEST_DIR}/bin/python2.6 ${YT_DIR}/distribute_setup.py 2>&1 ) 1>> ${LOG_FILE} || do_exit
+
+echo "Installing Pip."
+( ${DEST_DIR}/bin/easy_install-2.6 pip 2>&1 ) 1>> ${LOG_FILE} || do_exit
 
 do_setup_py numpy-1.3.0 ${NUMPY_ARGS}
@@ -339 +342 @@
 then
     echo "Installing Mercurial."
-    ( ${DEST_DIR}/bin/easy_install-2.6 mercurial 2>&1 ) 1>> ${LOG_FILE} || do_exit
+    ( ${DEST_DIR}/bin/pip install -U mercurial 2>&1 ) 1>> ${LOG_FILE} || do_exit
 fi
 
@@ -345 +348 @@
 then
     echo "Installing Traits"
-    ( ${DEST_DIR}/bin/easy_install-2.6 -U TraitsGUI TraitsBackendWX 2>&1 ) 1>> ${LOG_FILE} || do_exit
+    ( ${DEST_DIR}/bin/pip install -U TraitsGUI TraitsBackendWX 2>&1 ) 1>> ${LOG_FILE} || do_exit
 fi
 

trunk/setup.py

@@ -3 +3 @@
 import time
 import subprocess
-import ez_setup
-ez_setup.use_setuptools()
+import distribute_setup
+distribute_setup.use_setuptools()
 
 import setuptools
@@ -11 +11 @@
 DATA_FILES = []
 PY2APP_OPTIONS = {'argv_emulation': True}
-VERSION = "1.6dev"
+VERSION = "2.0dev"
 
 if os.path.exists('MANIFEST'): os.remove('MANIFEST')