sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4671d873465298b59c9fcee017239c30cb93c304)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4671d873465298b59c9fcee017239c30cb93c304)
- Date: Mon, 29 Apr 2013 10:37:23 -0500
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
ChangeLog | 3 +++
python-pypi/FUNCTIONS | 12 ++++++------
python-pypi/distribute/DEPENDS | 3 ++-
python-pypi/distribute/DETAILS | 4 ++--
python-pypi/distribute/HISTORY | 4 ++++
python-pypi/python-dateutil/DEPENDS | 3 +--
python-pypi/python-dateutil/HISTORY | 3 +++
7 files changed, 21 insertions(+), 11 deletions(-)
New commits:
commit 4671d873465298b59c9fcee017239c30cb93c304
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
python-pypi/FUNCTIONS: fix usage when both python 2,3 are installed
commit 6edbdfd4f7292c585b679b5acd7b1b06974c8205
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
distribute: => 0.6.36
commit 4a000bc105ebf86101a1948bd1e7d292cc4ad4fe
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
python-dateutil - fix python3 usage
diff --git a/ChangeLog b/ChangeLog
index 04c71e6..070206b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * python-pypi/FUNCTIONS: fix use with both python{2,}
+
2013-04-23 Treeve Jelbert <treeve AT sourcemage.org>
* gnu.gpg: add key 30D155AD Karl Berry <karl AT freefriends.org>
diff --git a/python-pypi/FUNCTIONS b/python-pypi/FUNCTIONS
index c24f1cf..24bd4c0 100755
--- a/python-pypi/FUNCTIONS
+++ b/python-pypi/FUNCTIONS
@@ -2,10 +2,10 @@
## Section-default build script.
#-------------------------------------------------------------------------
function default_build() {
- if is_depends_enabled $SPELL python3;then
- default_build_python3
- else
+ if is_depends_enabled $SPELL python;then
default_build_python
+ else
+ default_build_python3
fi
}
@@ -13,9 +13,9 @@ function default_build() {
## Section-default install script.
#-------------------------------------------------------------------------
function default_install() {
- if is_depends_enabled $SPELL python3;then
- default_install_python3
- else
+ if is_depends_enabled $SPELL python;then
default_install_python
+ else
+ default_install_python3
fi
}
diff --git a/python-pypi/distribute/DEPENDS b/python-pypi/distribute/DEPENDS
index e4ea57a..dbf35ed 100755
--- a/python-pypi/distribute/DEPENDS
+++ b/python-pypi/distribute/DEPENDS
@@ -1 +1,2 @@
-depends PYTHON
+optional_depends python3 '' '' 'support Python v3' &&
+optional_depends python '' '' 'support Python v2'
diff --git a/python-pypi/distribute/DETAILS b/python-pypi/distribute/DETAILS
index 812aba7..d515a2e 100755
--- a/python-pypi/distribute/DETAILS
+++ b/python-pypi/distribute/DETAILS
@@ -1,6 +1,6 @@
SPELL=distribute
- VERSION=0.6.35
-
SOURCE_HASH=sha512:79e00fafe3dd1ae499dc3ad6ccd7dfb53254544765de64b929bb32737edc2bc948406973469d830a1e39da229949d9ed966088c635fc20819cc8667d5d8ea2e7
+ VERSION=0.6.36
+
SOURCE_HASH=sha512:4f9b8408c142d837d88225364e0a312d9e058b5b7a9d74e1783b2208b197b5d7bddd09185623b324163affe080764b2fba7f3242d4b9b9c624f08e0942d0fed6
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://pypi.python.org/packages/source/d/${SPELL}/${SOURCE}
diff --git a/python-pypi/distribute/HISTORY b/python-pypi/distribute/HISTORY
index d22af8a..b0d09d0 100644
--- a/python-pypi/distribute/HISTORY
+++ b/python-pypi/distribute/HISTORY
@@ -1,3 +1,7 @@
+2013-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.36
+ * DEPENDS: allow simultaneous install for both python{2,3}
+
2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6.35
diff --git a/python-pypi/python-dateutil/DEPENDS
b/python-pypi/python-dateutil/DEPENDS
index 503782e..48d8ddc 100755
--- a/python-pypi/python-dateutil/DEPENDS
+++ b/python-pypi/python-dateutil/DEPENDS
@@ -1,2 +1 @@
-depends python &&
-depends SETUPTOOLS
+. $SECTION_DIRECTORY/PY_DEPENDS
diff --git a/python-pypi/python-dateutil/HISTORY
b/python-pypi/python-dateutil/HISTORY
index b0828af..c6f31aa 100644
--- a/python-pypi/python-dateutil/HISTORY
+++ b/python-pypi/python-dateutil/HISTORY
@@ -1,3 +1,6 @@
+2013-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: imporve python3 depends
+
2012-03-11 Robin Cook <rcook AT wyrms.net>
* PREPARE: added to select python2 or python3 branch
* DETAILS: changed to use the selection from PREPARE
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4671d873465298b59c9fcee017239c30cb93c304), Treeve Jelbert, 04/29/2013
Archive powered by MHonArc 2.6.24.