* [gentoo-commits] gentoo-x86 commit in dev-python/kombu: kombu-2.4.10.ebuild ChangeLog
@ 2012-11-29 7:28 Patrick Lauer (patrick)
0 siblings, 0 replies; 3+ messages in thread
From: Patrick Lauer (patrick) @ 2012-11-29 7:28 UTC (permalink / raw
To: gentoo-commits
patrick 12/11/29 07:28:36
Modified: ChangeLog
Added: kombu-2.4.10.ebuild
Log:
Bump
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.11 dev-python/kombu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 26 Nov 2012 22:47:19 -0000 1.10
+++ ChangeLog 29 Nov 2012 07:28:36 -0000 1.11
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/kombu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.10 2012/11/26 22:47:19 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.11 2012/11/29 07:28:36 patrick Exp $
+
+*kombu-2.4.10 (29 Nov 2012)
+
+ 29 Nov 2012; Patrick Lauer <patrick@gentoo.org> +kombu-2.4.10.ebuild:
+ Bump
*kombu-2.4.9 (26 Nov 2012)
1.1 dev-python/kombu/kombu-2.4.10.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild?rev=1.1&content-type=text/plain
Index: kombu-2.4.10.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v 1.1 2012/11/29 07:28:36 patrick Exp $
EAPI="4"
PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
PYTHON_DEPEND="*:2.7"
RESTRICT_PYTHON_ABIS="2.[4-6]"
SUPPORT_PYTHON_ABIS="1"
DISTUTILS_SRC_TEST="nosetests"
inherit distutils
DESCRIPTION="AMQP Messaging Framework for Python"
HOMEPAGE="http://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc examples test"
RDEPEND=">=dev-python/anyjson-0.3.3
>=dev-python/amqplib-1.0.2"
DEPEND="${RDEPEND}
test? ( dev-python/nose-cover3
dev-python/mock
>=dev-python/unittest2-0.5.0
dev-python/simplejson
dev-python/anyjson
dev-python/redis-py
dev-python/pymongo
dev-python/msgpack )
doc? ( dev-python/sphinx
dev-python/beanstalkc
dev-python/couchdb-python )
dev-python/setuptools"
src_compile() {
distutils_src_compile
use doc && emake -C docs html
}
src_test() {
testing() {
nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
}
python_execute_function testing
}
src_install() {
distutils_src_install
if use examples; then
docompress -x usr/share/doc/${P}/examples/
insinto usr/share/doc/${P}/
doins -r examples/
fi
use doc && dohtml -r docs/.build/html/
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/kombu: kombu-2.4.10.ebuild ChangeLog
@ 2012-12-08 13:04 Ian Delaney (idella4)
0 siblings, 0 replies; 3+ messages in thread
From: Ian Delaney (idella4) @ 2012-12-08 13:04 UTC (permalink / raw
To: gentoo-commits
idella4 12/12/08 13:04:31
Modified: kombu-2.4.10.ebuild ChangeLog
Log:
USE doc with python3 set to die due to inability of py3 to build docs, fixed build of docs with py2, fixes bug #No. 445688 by flameeyes
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path
1.2 dev-python/kombu/kombu-2.4.10.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild?r1=1.1&r2=1.2
Index: kombu-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kombu-2.4.10.ebuild 29 Nov 2012 07:28:36 -0000 1.1
+++ kombu-2.4.10.ebuild 8 Dec 2012 13:04:31 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v 1.1 2012/11/29 07:28:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v 1.2 2012/12/08 13:04:31 idella4 Exp $
EAPI="4"
@@ -33,13 +33,34 @@
dev-python/pymongo
dev-python/msgpack )
doc? ( dev-python/sphinx
+ dev-python/django
dev-python/beanstalkc
dev-python/couchdb-python )
dev-python/setuptools"
+src_prepare() {
+ CheckDoc() {
+ if [[ "$(python_get_version --major)" == '3' ]] && use doc; then
+ eerror ""
+ eerror "Python3 ***CANNOT*** build the docs for this package"
+ error "due to a dependency on django, which does not support python3"
+ eerror "Docs can be built effectively with python2."
+ eerror "Prepend with USE_PYTHON=2.7 and recommence emerge"
+ eerror ""
+ die
+ fi
+ }
+ python_execute_function CheckDoc
+ distutils_src_prepare
+}
+
src_compile() {
distutils_src_compile
- use doc && emake -C docs html
+
+ makedocs() {
+ PYTHONPATH="${S}" emake -C docs html
+ }
+ use doc && python_execute_function makedocs
}
src_test() {
@@ -53,7 +74,7 @@
distutils_src_install
if use examples; then
docompress -x usr/share/doc/${P}/examples/
- insinto usr/share/doc/${P}/
+ insinto usr/share/doc/${PF}/
doins -r examples/
fi
use doc && dohtml -r docs/.build/html/
1.12 dev-python/kombu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?r1=1.11&r2=1.12
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog 29 Nov 2012 07:28:36 -0000 1.11
+++ ChangeLog 8 Dec 2012 13:04:31 -0000 1.12
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/kombu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.11 2012/11/29 07:28:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.12 2012/12/08 13:04:31 idella4 Exp $
+
+ 09 Dec 2012; Ian Delaney <idella4@gentoo.org> kombu-2.4.10.ebuild:
+ USE doc with python3 set to die due to inability of py3 to build docs, fixed
+ build of docs with py2, fixes bug #No. 445688 by flameeyes
*kombu-2.4.10 (29 Nov 2012)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/kombu: kombu-2.4.10.ebuild ChangeLog
@ 2012-12-10 12:20 Ian Delaney (idella4)
0 siblings, 0 replies; 3+ messages in thread
From: Ian Delaney (idella4) @ 2012-12-10 12:20 UTC (permalink / raw
To: gentoo-commits
idella4 12/12/10 12:20:04
Modified: kombu-2.4.10.ebuild ChangeLog
Log:
Improved 'variation on the theme' to build docs avoiding use of die with python3, prompted by Arfrever wrt initial Bug #445688
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path
1.3 dev-python/kombu/kombu-2.4.10.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild?r1=1.2&r2=1.3
Index: kombu-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kombu-2.4.10.ebuild 8 Dec 2012 13:04:31 -0000 1.2
+++ kombu-2.4.10.ebuild 10 Dec 2012 12:20:04 -0000 1.3
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v 1.2 2012/12/08 13:04:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v 1.3 2012/12/10 12:20:04 idella4 Exp $
EAPI="4"
PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[4-6]"
+RESTRICT_PYTHON_ABIS="2.[56]"
SUPPORT_PYTHON_ABIS="1"
DISTUTILS_SRC_TEST="nosetests"
@@ -38,29 +38,19 @@
dev-python/couchdb-python )
dev-python/setuptools"
-src_prepare() {
- CheckDoc() {
- if [[ "$(python_get_version --major)" == '3' ]] && use doc; then
- eerror ""
- eerror "Python3 ***CANNOT*** build the docs for this package"
- error "due to a dependency on django, which does not support python3"
- eerror "Docs can be built effectively with python2."
- eerror "Prepend with USE_PYTHON=2.7 and recommence emerge"
- eerror ""
- die
- fi
- }
- python_execute_function CheckDoc
- distutils_src_prepare
-}
-
src_compile() {
distutils_src_compile
- makedocs() {
- PYTHONPATH="${S}" emake -C docs html
- }
- use doc && python_execute_function makedocs
+ local SPHINXBUILD
+ if use doc; then
+ if python2.7 -c "import django.conf" &> /dev/null; then
+ SPHINXBUILD="sphinx-build-2.7"
+ else
+ die "kombu docs failed installation"
+ fi
+ einfo "building docs for kombu with python2.7"
+ PYTHONPATH="${S}" emake -C docs html SPHINXBUILD="${SPHINXBUILD}"
+ fi
}
src_test() {
1.13 dev-python/kombu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?r1=1.12&r2=1.13
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog 8 Dec 2012 13:04:31 -0000 1.12
+++ ChangeLog 10 Dec 2012 12:20:04 -0000 1.13
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/kombu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.12 2012/12/08 13:04:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.13 2012/12/10 12:20:04 idella4 Exp $
+
+ 11 Dec 2012; Ian Delaney <idella4@gentoo.org> kombu-2.4.10.ebuild:
+ Improved 'variation on the theme' to build docs avoiding use of die with
+ python3, prompted by Arfrever wrt initial Bug #445688
09 Dec 2012; Ian Delaney <idella4@gentoo.org> kombu-2.4.10.ebuild:
USE doc with python3 set to die due to inability of py3 to build docs, fixed
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-10 12:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-29 7:28 [gentoo-commits] gentoo-x86 commit in dev-python/kombu: kombu-2.4.10.ebuild ChangeLog Patrick Lauer (patrick)
-- strict thread matches above, loose matches on Subject: below --
2012-12-08 13:04 Ian Delaney (idella4)
2012-12-10 12:20 Ian Delaney (idella4)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox