Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 ChangeLog                      |    3 +++
 FUNCTIONS                      |    4 ++--
 python-pypi/setuptools/DETAILS |    4 ++--
 python-pypi/setuptools/HISTORY |    3 +++
 python-pypi/xlwt/DETAILS       |   13 +++++++------
 python-pypi/xlwt/HISTORY       |    4 ++++
 6 files changed, 21 insertions(+), 10 deletions(-)

New commits:
commit ad4d9e05f22c5389c2db2f79901598c2be4b00f3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    xlwt: => 0.8.0

commit 559e955724ce573573b4901423cdaea2c702924a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    FUNCTIONS - fix python2 usage

commit 62b2711be04860596de12ace29546b8a6fb8ee98
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    setuptools: => 1.4.1

diff --git a/ChangeLog b/ChangeLog
index b9b0d3e..55451c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-11-24  Treeve Jelbert <treeve AT sourcemage.org>
+       * FUNCTIONS: fix for python2 usage when it is not primary installation
+
 2013-11-24 Jeremy Blosser <jblosser AT sourcemage.org>
        * python-pypi/viridian: new spell, ampache client in python
 
diff --git a/FUNCTIONS b/FUNCTIONS
index 4b2bae8..a7aca22 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -453,7 +453,7 @@ function unpack_file() {
 ## Default build for Python2 spell.
 #-------------------------------------------------------------------------
 function default_build_python() {
-  python2 setup.py build "$@"
+  $PYTHON2 setup.py build "$@"
 }
 
 #-------------------------------------------------------------------------
@@ -467,7 +467,7 @@ function default_build_python3() {
 ## Default install for Python spell.
 #-------------------------------------------------------------------------
 function default_install_python() {
-  python2 setup.py install --root "$INSTALL_ROOT/" "$@"
+  $PYTHON2 setup.py install --root "$INSTALL_ROOT/" "$@"
 }
 
 #-------------------------------------------------------------------------
diff --git a/python-pypi/setuptools/DETAILS b/python-pypi/setuptools/DETAILS
index 2524078..1040f9b 100755
--- a/python-pypi/setuptools/DETAILS
+++ b/python-pypi/setuptools/DETAILS
@@ -1,6 +1,6 @@
            SPELL=setuptools
-         VERSION=1.3.2
-     
SOURCE_HASH=sha512:fc4e19a4933730fbe2892092cee993414beebd5a42accb20597771469ebab453581ec330272a2d7a73e5934d1d2e3c656329b6bebf6f4330d3a55ff2adb6eb60
+         VERSION=1.4.1
+     
SOURCE_HASH=sha512:434b3c336da78a5c653ed85768c14bf5acacb9a1b85a65df2195d435531457accc2a4efea87fcae574b10abca77ef612d26f73c854e02c8f9c3b6caae2c84e01
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELL/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY
index cc8b847..822d0cb 100644
--- a/python-pypi/setuptools/HISTORY
+++ b/python-pypi/setuptools/HISTORY
@@ -1,3 +1,6 @@
+2013-11-24 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.4.1
+
 2013-11-14 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.3.2
 
diff --git a/python-pypi/xlwt/DETAILS b/python-pypi/xlwt/DETAILS
index e4cfda3..c63e245 100755
--- a/python-pypi/xlwt/DETAILS
+++ b/python-pypi/xlwt/DETAILS
@@ -1,10 +1,11 @@
            SPELL=xlwt
-         VERSION=0.7.5
-     
SOURCE_HASH=sha512:d385c36c80002998891dd93d4ebcdd962239463ee089965961d3b8955d4783bbcdec96920891a252ee6cb076eab6b13ffad83e7758c179dcbc684e82fa8dfe35
-          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://pypi.python.org/pypi/xlwt
-   SOURCE_URL[0]=http://pypi.python.org/packages/source/x/$SPELL/$SOURCE
+          SPELLX=xlwt-future
+         VERSION=0.8.0
+     
SOURCE_HASH=sha512:2414c260e8be25cb288a02ee252b97372e1556aaddd191290c85f037094ee5222849a43cc032e9af54aa1f524e3a33a51b6d528d861343775db498ffb6bcb07e
+          SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+        WEB_SITE=http://pypi.python.org/pypi/$SPELLx
+   SOURCE_URL[0]=http://pypi.python.org/packages/source/x/$SPELLX/$SOURCE
       LICENSE[0]=BSD
          ENTERED=20090930
         KEYWORDS="python "
diff --git a/python-pypi/xlwt/HISTORY b/python-pypi/xlwt/HISTORY
index bc33c94..b6de5a5 100644
--- a/python-pypi/xlwt/HISTORY
+++ b/python-pypi/xlwt/HISTORY
@@ -1,3 +1,7 @@
+2013-11-24 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.8.0
+         use xlwt-future
+
 2013-04-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.7.5
        * DEPENDS: fix python3 usage