Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c0ee14fe8afdf9f035aad59547a2384719294a12)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c0ee14fe8afdf9f035aad59547a2384719294a12)

Chronological Thread  
    < Chronological >       < Thread >
  • 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 (c0ee14fe8afdf9f035aad59547a2384719294a12)
  • Date: Thu, 21 Nov 2013 10:29:23 -0600
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 16 ++++++++++++++--
libs/libxml2/BUILD | 7 -------
libs/libxml2/HISTORY | 3 +++
python-pypi/PY_DEPENDS | 5 +----
python-pypi/babel/DEPENDS | 3 +--
python-pypi/babel/DETAILS | 8 ++++----
python-pypi/babel/HISTORY | 4 ++++
python-pypi/chardet/DEPENDS | 3 ++-
python-pypi/chardet/HISTORY | 3 +++
python-pypi/numpy/DETAILS | 4 ++--
python-pypi/numpy/HISTORY | 3 +++
python-pypi/pybindgen/DEPENDS | 2 +-
python-pypi/pybindgen/HISTORY | 3 +++
python-pypi/pyopenssl/DEPENDS | 2 +-
python-pypi/pyopenssl/HISTORY | 3 +++
python-pypi/pyutil/DETAILS | 4 ++--
python-pypi/pyutil/HISTORY | 3 +++
python-pypi/tempita/DEPENDS | 3 +--
python-pypi/tempita/HISTORY | 3 +++
python-pypi/webhelpers/DEPENDS | 3 +--
python-pypi/webhelpers/HISTORY | 3 +++
python-pypi/webob/DEPENDS | 3 +--
python-pypi/webob/HISTORY | 3 +++
24 files changed, 65 insertions(+), 32 deletions(-)

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

libxml2 - tweak build for python3

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

numpy: => 1.8.0

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

chardet - depends PYTHON

commit 4723797da32986d6874ea09f0b0ce83f72cf8005
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pyutil: => 1.9.7

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

babel: => 1.3

commit 2cf5d48f97a6a245dc366e43738589c8eebbb28b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

webhelpers - python3 support

commit 219c7329127147bd4f613f1f370b408a2fbe4a10
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

babel - python3 support

commit 3553fb1feba14e662115693b37ae717a0228a620
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

webob - python3 support

commit 0829a0a195cf5551d9b17c097b67771cacd18f89
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

tempita - python3 support

commit 36f8ddd7761b80015ce07e5dd54c4ddb08b4aa7d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pybindgen - depends PYTHON

commit 92b24111a843deda790ecad17fe788562d514539
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pyopenssl - depends PYTHON

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

fix builds involving python3.3

diff --git a/ChangeLog b/ChangeLog
index e5d31c3..513b111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS,python-pypi/PY_DEPENDS: fix builds involving python3.3
+
2013-11-20 Vlad Glagolev <stealth AT sourcemage.org>
* loop-AES.gpg: added 8132F189 public key (Jari Ruusu (2013)
<jariruusu AT users.sourceforge.net>)
diff --git a/FUNCTIONS b/FUNCTIONS
index 1d5dbf7..4b2bae8 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -2,6 +2,18 @@
. $GRIMOIRE/libgcc
. $GRIMOIRE/config_query_multi.function

+if is_depends_enabled $SPELL python;then
+ VV=`installed_version python1 | cut -c-3` &&
+ PYTHON2=/usr/bin/python${VV}
+ export PYTHON=$PYTHON2
+fi
+
+if is_depends_enabled $SPELL python3;then
+ VV=`installed_version python3 | cut -c-3` &&
+ PYTHON3=/usr/bin/python${VV}m
+ export PYTHON=$PYTHON3
+fi
+
QT5DIR=$INSTALL_ROOT/opt/qt5
qt5_build() {
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
@@ -448,7 +460,7 @@ function default_build_python() {
## Default build for Python 3 spell.
#-------------------------------------------------------------------------
function default_build_python3() {
- python3 setup.py build "$@"
+ $PYTHON3 setup.py build "$@"
}

#-------------------------------------------------------------------------
@@ -462,7 +474,7 @@ function default_install_python() {
## Default install for Python 3 spell.
#-------------------------------------------------------------------------
function default_install_python3() {
- python3 setup.py install --root "$INSTALL_ROOT/" "$@"
+ $PYTHON3 setup.py install --root "$INSTALL_ROOT/" "$@"
}

#-------------------------------------------------------------------------
diff --git a/libs/libxml2/BUILD b/libs/libxml2/BUILD
deleted file mode 100755
index 10eb6b8..0000000
--- a/libs/libxml2/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-if is_depends_enabled $SPELL python3;then
- export PYTHON=/usr/bin/python3
-fi &&
-if is_depends_enabled $SPELL python;then
- export PYTHON=/usr/bin/python2.7
-fi &&
-default_build
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index d0a1e12..a271d2f 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,6 @@
+2013-11-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: deleted, python usege is solved in FUNCTIONS
+
2013-07-25 Treeve Jelbert <treeve AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: adjust to python3
* BUILD: added, fix detection of python3
diff --git a/python-pypi/PY_DEPENDS b/python-pypi/PY_DEPENDS
index f20cfb3..540295f 100755
--- a/python-pypi/PY_DEPENDS
+++ b/python-pypi/PY_DEPENDS
@@ -1,5 +1,2 @@
depends PYTHON &&
-# distutils is now included with python3
-if is_depends_enabled $SPELL python; then
- depends setuptools
-fi
+depends setuptools
diff --git a/python-pypi/babel/DEPENDS b/python-pypi/babel/DEPENDS
index 503782e..48d8ddc 100755
--- a/python-pypi/babel/DEPENDS
+++ b/python-pypi/babel/DEPENDS
@@ -1,2 +1 @@
-depends python &&
-depends SETUPTOOLS
+. $SECTION_DIRECTORY/PY_DEPENDS
diff --git a/python-pypi/babel/DETAILS b/python-pypi/babel/DETAILS
index 144511c..c2df258 100755
--- a/python-pypi/babel/DETAILS
+++ b/python-pypi/babel/DETAILS
@@ -1,11 +1,11 @@
SPELL=babel
SPELLX=Babel
- VERSION=0.9.6
-
SOURCE_HASH=sha512:65a93a405f8734dba5e36bac62e574633214660667ba5b2a8c1120924a93fed84a2a5087127d20bd33e98fbd8400bb7634f56b27d5f6db574c81ee5fe10ee537
+ VERSION=1.3
+
SOURCE_HASH=sha512:3173d578c36d7a20d14ffcf6406ec9fe301e71a199069b3d2e53bd0c66e7f83d6e94f071dc08f2708202ec1ace4d14f4476234cc8347a37b05317302f0cfe0cf
SOURCE=$SPELLX-$VERSION.tar.gz
- SOURCE_URL[0]=http://ftp.edgewall.com/pub/$SPELL/$SOURCE
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/B/$SPELLX/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
- WEB_SITE=http://babel.edgewall.org/
+ WEB_SITE=http://babel.pocoo.org/
LICENSE[0]=BSD
SHORT="tools for internationalizing Python applications"
cat << EOF
diff --git a/python-pypi/babel/HISTORY b/python-pypi/babel/HISTORY
index cfe8f75..2320aca 100644
--- a/python-pypi/babel/HISTORY
+++ b/python-pypi/babel/HISTORY
@@ -1,3 +1,7 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3, new website & url
+ * DEPENDS: PYTHON
+
2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider

diff --git a/python-pypi/chardet/DEPENDS b/python-pypi/chardet/DEPENDS
index a86d429..178a7f5 100755
--- a/python-pypi/chardet/DEPENDS
+++ b/python-pypi/chardet/DEPENDS
@@ -1 +1,2 @@
-depends python
+. $SECTION_DIRECTORY/PY_DEPENDS
+
diff --git a/python-pypi/chardet/HISTORY b/python-pypi/chardet/HISTORY
index a4a9724..8df6fc6 100644
--- a/python-pypi/chardet/HISTORY
+++ b/python-pypi/chardet/HISTORY
@@ -1,3 +1,6 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: PYTHON
+
2013-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.1
new website & url
diff --git a/python-pypi/numpy/DETAILS b/python-pypi/numpy/DETAILS
index 46d2a3f..1e3aa37 100755
--- a/python-pypi/numpy/DETAILS
+++ b/python-pypi/numpy/DETAILS
@@ -1,6 +1,6 @@
SPELL=numpy
- VERSION=1.7.1
-
SOURCE_HASH=sha512:d58177f3971b6d07baf6f81a2088ba371c7e43ea64ee7ada261da97c6d725b4bd4927122ac373c55383254e4e31691939276dab08a79a238bfa55172a3eff684
+ VERSION=1.8.0
+
SOURCE_HASH=sha512:ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/numpy/HISTORY b/python-pypi/numpy/HISTORY
index d380e01..527ac25 100644
--- a/python-pypi/numpy/HISTORY
+++ b/python-pypi/numpy/HISTORY
@@ -1,3 +1,6 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.0
+
2013-04-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.1
* DEPENDS: fix python3 usage
diff --git a/python-pypi/pybindgen/DEPENDS b/python-pypi/pybindgen/DEPENDS
index 3e78464..1de373d 100755
--- a/python-pypi/pybindgen/DEPENDS
+++ b/python-pypi/pybindgen/DEPENDS
@@ -1,3 +1,3 @@
-depends python &&
+. $SECTION_DIRECTORY/PY_DEPENDS
depends gccxml &&
optional_depends pygccxml '' '' 'describe API in Python terms'
diff --git a/python-pypi/pybindgen/HISTORY b/python-pypi/pybindgen/HISTORY
index cd1361a..f081294 100644
--- a/python-pypi/pybindgen/HISTORY
+++ b/python-pypi/pybindgen/HISTORY
@@ -1,3 +1,6 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: PYTHON3
+
2013-06-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.16.0
spell created
diff --git a/python-pypi/pyopenssl/DEPENDS b/python-pypi/pyopenssl/DEPENDS
index 96ce075..a7039a1 100755
--- a/python-pypi/pyopenssl/DEPENDS
+++ b/python-pypi/pyopenssl/DEPENDS
@@ -1,2 +1,2 @@
-depends python &&
+. $SECTION_DIRECTORY/PY_DEPENDS &&
depends openssl
diff --git a/python-pypi/pyopenssl/HISTORY b/python-pypi/pyopenssl/HISTORY
index 009fff6..7bc70d2 100644
--- a/python-pypi/pyopenssl/HISTORY
+++ b/python-pypi/pyopenssl/HISTORY
@@ -1,3 +1,6 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: use PYTHON
+
2013-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.13.1
SECURITY_PATCH=1, fixes CVE-2013-4314
diff --git a/python-pypi/pyutil/DETAILS b/python-pypi/pyutil/DETAILS
index 238c931..7785349 100755
--- a/python-pypi/pyutil/DETAILS
+++ b/python-pypi/pyutil/DETAILS
@@ -1,6 +1,6 @@
SPELL=pyutil
- VERSION=1.9.4
-
SOURCE_HASH=sha512:78df200025b96bf410eeb7e364e84d627761cb85a0cbfba65dea8ac3db2231128017a6ddf74e0002208d774c96445508932406a2016cc78274269a74b2bfbcc4
+ VERSION=1.9.7
+
SOURCE_HASH=sha512:467de9eb6a4b085bfcc11e1bab318220d440bbb1fd665ec32c4edf274599e53cc450a5a06fcd015e966acd597d5fcfa1b389f639aa6b3d6b0009a8eec6b11946
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pypi.python.org/pypi/$SPELL
diff --git a/python-pypi/pyutil/HISTORY b/python-pypi/pyutil/HISTORY
index 96c5159..972e280 100644
--- a/python-pypi/pyutil/HISTORY
+++ b/python-pypi/pyutil/HISTORY
@@ -1,3 +1,6 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAINS: version 1,9,7
+
2012-12-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.4

diff --git a/python-pypi/tempita/DEPENDS b/python-pypi/tempita/DEPENDS
index 84a0acc..48d8ddc 100755
--- a/python-pypi/tempita/DEPENDS
+++ b/python-pypi/tempita/DEPENDS
@@ -1,2 +1 @@
-depends python &&
-depends SETUPTOOLS
+. $SECTION_DIRECTORY/PY_DEPENDS
diff --git a/python-pypi/tempita/HISTORY b/python-pypi/tempita/HISTORY
index aa245c4..5b8faf8 100644
--- a/python-pypi/tempita/HISTORY
+++ b/python-pypi/tempita/HISTORY
@@ -1,3 +1,6 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: PYTHON
+
2011-12-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.1

diff --git a/python-pypi/webhelpers/DEPENDS b/python-pypi/webhelpers/DEPENDS
index 02a0f5e..9af9ef8 100755
--- a/python-pypi/webhelpers/DEPENDS
+++ b/python-pypi/webhelpers/DEPENDS
@@ -1,3 +1,2 @@
-depends python &&
-depends SETUPTOOLS &&
+. $SECTION_DIRECTORY/PY_DEPENDS
depends markupsafe
diff --git a/python-pypi/webhelpers/HISTORY b/python-pypi/webhelpers/HISTORY
index 6da693c..9a83b0d 100644
--- a/python-pypi/webhelpers/HISTORY
+++ b/python-pypi/webhelpers/HISTORY
@@ -1,3 +1,6 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: PYTHON
+
2012-02-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3

diff --git a/python-pypi/webob/DEPENDS b/python-pypi/webob/DEPENDS
index 84a0acc..48d8ddc 100755
--- a/python-pypi/webob/DEPENDS
+++ b/python-pypi/webob/DEPENDS
@@ -1,2 +1 @@
-depends python &&
-depends SETUPTOOLS
+. $SECTION_DIRECTORY/PY_DEPENDS
diff --git a/python-pypi/webob/HISTORY b/python-pypi/webob/HISTORY
index 8c43faa..b06b1d1 100644
--- a/python-pypi/webob/HISTORY
+++ b/python-pypi/webob/HISTORY
@@ -1,3 +1,6 @@
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: PYTHON
+
2012-12-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.3



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c0ee14fe8afdf9f035aad59547a2384719294a12), Treeve Jelbert, 11/21/2013

Archive powered by MHonArc 2.6.24.

Top of Page