[dev-python/mwlib] Add mwlib, other cleanups, fixes

13 files changed, 306 insertions, 11 deletions

diff --git a/dev-python/errorhandler/Manifest b/dev-python/errorhandler/Manifest
new file mode 100644
index 0000000..38b3f94
--- /dev/null
+++ b/dev-python/errorhandler/Manifest
@@ -0,0 +1 @@
+DIST errorhandler-1.1.1.tar.gz 8321 SHA256 2baa97a8a256fe72960d196bbdee4404162186f539c4d73b3f1c072db18463e9 SHA512 a2f875537103086be956becfdac25a43a646a89b404b6a7a2a243c6d2ddbc29d55948b781529d0a0fa82b163187747f3396b62ed0be98d39834de038cc4a1fd2 WHIRLPOOL dd296200b2a451ae36225122d69e215e463a777ca162ed4b98067e146080e5fa91fd4ee8a219fc0999a05461aa69c712866e57c3b31c9a19366d82ea8efdad8a
diff --git a/dev-python/errorhandler/errorhandler-1.1.1.ebuild b/dev-python/errorhandler/errorhandler-1.1.1.ebuild
new file mode 100644
index 0000000..86be63d
--- /dev/null
+++ b/dev-python/errorhandler/errorhandler-1.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+PYTHON_DEPEND="2:"
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST=nosetests
+inherit distutils
+
+DESCRIPTION="A logging framework handler, tracks when messages above a certain level are logged"
+HOMEPAGE="http://pypi.python.org/pypi/errorhandler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+IUSE="doc"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pkginfo
+	doc? ( dev-python/sphinx )"
+
+src_prepare() {
+	sed -e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' -i docs/Makefile
+	distutils_src_prepare
+}
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	distutils_src_test errorhandler/tests.py
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r docs/_build/html/
+		docompress -x usr/share/doc/${P}/doctrees
+		insinto usr/share/doc/${P}/
+		doins -r docs/_build/doctrees
+	fi
+}
diff --git a/dev-python/errorhandler/metadata.xml b/dev-python/errorhandler/metadata.xml
new file mode 100644
index 0000000..472ba46
--- /dev/null
+++ b/dev-python/errorhandler/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>johneed@hotmail.com</email>
+		<name>Ian Delaney</name>
+	</maintainer>
+	<maintainer>
+		<email>tampakrap@gentoo.org</email>
+		<name>Theo Chatzimichos</name>
+	</maintainer>
+	<herd>python</herd>
+</pkgmetadata>
+
diff --git a/dev-python/multiprocessing/multiprocessing-2.6.2.1.ebuild b/dev-python/multiprocessing/multiprocessing-2.6.2.1.ebuild
index 4a87ef6..e5a9d03 100644
--- a/dev-python/multiprocessing/multiprocessing-2.6.2.1.ebuild
+++ b/dev-python/multiprocessing/multiprocessing-2.6.2.1.ebuild
@@ -28,14 +28,12 @@ src_compile() {
 	if use doc; then
 		sphinx-build -b html Doc/ glossary
 	fi
-
-	distutils_src_compile
 }
 
 src_install() {
+	distutils_src_install
+
 	if use doc; then
 		dohtml -r glossary
 	fi
-
-	distutils_src_install
 }
diff --git a/dev-python/mwlib/Manifest b/dev-python/mwlib/Manifest
new file mode 100644
index 0000000..b003004
--- /dev/null
+++ b/dev-python/mwlib/Manifest
@@ -0,0 +1 @@
+DIST mwlib-0.13.7.zip 1837738 SHA256 f2f01ec38880e88377fa483461ff80d1b2c86b95f9dbbfbdcae092dd5827ed35 SHA512 67b5756de6b8fecc01cbc27a6f070f24f2bb0e5bc539673a8ec5a460b40880f4e1393a625caaa530a40664f3c549cdfee54ef31d0fefcf4a78a7c4a4e2e9e8be WHIRLPOOL 8c3354cfe366b3b2d5756cc5b95994cf7aef5982cb1ad9da95796f7d011ffd25d7ce864310a6a9fa9e220ebb766babde4e4aeb07ab5e208ca76758e22728f26a
diff --git a/dev-python/mwlib/files/test.patch b/dev-python/mwlib/files/test.patch
new file mode 100644
index 0000000..44ae05e
--- /dev/null
+++ b/dev-python/mwlib/files/test.patch
@@ -0,0 +1,20 @@
+# Tests would make a tmp location outside {S}
+diff -ur ../mwlib-0.13.7.orig/tests/test_render.py ../mwlib-0.13.7/tests/test_render.py
+--- tests/test_render.py	2012-05-08 11:30:20.000000000 +0800
++++ tests/test_render.py	2012-05-18 16:27:07.456693095 +0800
+@@ -24,15 +24,3 @@
+             retval.append(x.name)
+ 
+     return retval
+-
+-
+-def test_render(writer, input):
+-    tmp = tempfile.mktemp()
+-    cmd = "mw-render -w %s -c %s -o %s" % (writer, input, tmp)
+-    print "running", cmd
+-    try:
+-        err = os.system(cmd)
+-        assert err == 0
+-    finally:
+-        if os.path.exists(tmp):
+-            os.unlink(tmp)
diff --git a/dev-python/mwlib/metadata.xml b/dev-python/mwlib/metadata.xml
new file mode 100644
index 0000000..4a7fe85
--- /dev/null
+++ b/dev-python/mwlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">mwlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mwlib/mwlib-0.13.7.ebuild b/dev-python/mwlib/mwlib-0.13.7.ebuild
new file mode 100644
index 0000000..62d2e72
--- /dev/null
+++ b/dev-python/mwlib/mwlib-0.13.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.13.7.ebuild,v 1.1 2012/04/19 09:54:31 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
+DISTUTILS_SRC_TEST=py.test
+inherit distutils eutils
+
+DESCRIPTION="Tools for parsing Mediawiki content to other formats"
+HOMEPAGE="http://code.pediapress.com/wiki/wiki http://pypi.python.org/pypi/mwlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/lxml
+	=dev-python/odfpy-0.9*
+	>=dev-python/pyPdf-1.12
+	>=dev-python/pyparsing-1.4.11
+	>=dev-python/timelib-0.2
+	virtual/latex-base
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-python/simplejson-2.5 )
+	dev-python/gevent
+	>=dev-python/bottle-0.10
+	dev-python/apipkg
+	>=dev-python/qserve-0.2.7
+	dev-python/roman
+	>=dev-python/py-1.4
+	dev-python/sqlite3dbm"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( dev-python/sphinx )
+	dev-python/setuptools"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_prepare() {
+	# mwlib.apipkg is actually used.
+	sed -e 's/, "apipkg"//' -i setup.py
+
+	distutils_src_prepare
+	# Disable test which requires installed mw-zip script.
+	rm -f tests/test_nuwiki.py
+	rm -f tests/test_redirect.py
+	rm -f tests/test_zipwiki.py
+#	epatch "${FILESDIR}"/test.patch
+}
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C  docs html
+}
+
+src_test() {
+	# Though DISTUTILS_SRC_TEST=py.test ought work, it errors out. Yet to know why.
+	# XNET=1 is what I was seeking from upstream. It disables xfails, having acquired it 
+	# it now appears to work with and without it.
+	py.test tests
+	# AFter re-emerging one or more of the deps, response has changed. 
+	# I leave this as a 'backup' and a record of what also worked by different means.		
+#	testing() {
+#	PYTHONPATH="$(find build-${PYTHON_ABI} -name mwlib)}/"
+#	local exit_status=0
+#	for test in tests/test_[b-z]*.py
+#	do
+#		PYTHONPATH="$(find build-${PYTHON_ABI} -name mwlib)}/" py.test -x $test || exit_status=1
+#	done
+#	return $exit_status
+#	}
+#	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		dohtml -r docs/_build/html/
+		docompress -x usr/share/doc/${P}/doctrees/
+		insinto usr/share/doc/${P}/
+		doins -r docs/_build/doctrees
+	fi
+}
diff --git a/dev-python/sqlite3dbm/sqlite3dbm-0.1.4.ebuild b/dev-python/sqlite3dbm/sqlite3dbm-0.1.4.ebuild
new file mode 100644
index 0000000..b425f83
--- /dev/null
+++ b/dev-python/sqlite3dbm/sqlite3dbm-0.1.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_USE_WITH="sqlite"
+DISTUTILS_SRC_TEST=setup.py
+inherit distutils vcs-snapshot
+
+DESCRIPTION="An sqlite-backed dictionary"
+HOMEPAGE="https://github.com/Yelp/sqlite3dbm http://pypi.python.org/pypi/sqlite3dbm/"
+SRC_URI="https://github.com/Yelp/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+RESTRICT=test
+
+RDEPEND=""
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/testify )"
+
+DOCS="AUTHORS.txt CHANGES.txt README.md"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc ; then
+		emake -C docs html
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r docs/_build/html/
+	fi
+}
+
+src_test() {
+	PYTHONPATH=.
+	testify test || return 1
+}
diff --git a/dev-python/testfixtures/testfixtures-2.3.4.ebuild b/dev-python/testfixtures/testfixtures-2.3.4.ebuild
index 1b479a7..4a84ad5 100644
--- a/dev-python/testfixtures/testfixtures-2.3.4.ebuild
+++ b/dev-python/testfixtures/testfixtures-2.3.4.ebuild
@@ -3,9 +3,9 @@
 # $Header: $
 
 EAPI=4
-PYTHON_DEPEND="2:2.6"
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.5 3.*"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-**-jython"
 DISTUTILS_SRC_TEST="py.test"
 inherit distutils eutils
 
@@ -27,14 +27,17 @@ src_prepare() {
 	sed -e s':SPHINXBUILD   = ../bin/sphinx-build:SPHINXBUILD   = /usr/bin/sphinx-build:' \
 		-i docs/Makefile
 	epatch "${FILESDIR}"/${P}-adjust_tests.patch
+
 	# remove test that tests the stripped zope-component test_components.ComponentsTests
 	rm -f testfixtures/tests/test_components.py || die
+	distutils_src_prepare
 }
 src_compile() {
 	distutils_src_compile
 
+	# Needs abs path
 	if use doc; then
-	emake -C docs html
+		PYTHONPATH="${S}" emake -C docs html
 	fi
 }
 
@@ -45,6 +48,9 @@ src_test() {
 src_install() {
 	distutils_src_install
 	if use doc; then
-		dohtml -r docs
+		dohtml -r docs/_build/html/
+		docompress -x usr/share/doc/${P}/doctrees
+		insinto usr/share/doc/${P}/
+		doins -r docs/_build/doctrees/
 	fi
 }
diff --git a/dev-python/xlutils/Manifest b/dev-python/xlutils/Manifest
index 0fba757..7266c59 100644
--- a/dev-python/xlutils/Manifest
+++ b/dev-python/xlutils/Manifest
@@ -1 +1,2 @@
 DIST xlutils-1.5.1.tar.gz 41778 SHA256 0cc2ba30e218722d2ac6464d288c845c356515866f5c6c2ce0480d32905e47e1 SHA512 a8f747f342e566ba1de9208d5c2db181c600aa21a1cdaa4cabf21539b95eecbec763475805d476a923d12f24d1623f1d63f2224beeca2cd58ca702a3067f640c WHIRLPOOL 2b7d3c62f731b0f291a79a29e5c7d1672dd44e1e2984fa323cb228e79694f2a8b842a3be94a7d2594170447d19b9fb630dd3da26f2d868abd46238480653c416
+DIST xlutils-1.5.2.tar.gz 48579 SHA256 5b8f2bc41983722a63009c0ab6216227d6bbc0a0f945c9cab33cd1ebac7666d0 SHA512 5611b08516ebcfc08f43b7b5a793c0d53c9e0dfe12b597ea318f10e794d323f87b07df0f96f58b1d4542feb7339ab7c6527c956c7a7af7d8554e41dad85c63d8 WHIRLPOOL 7a1cc3ac03fbcd1c768de6a259adaaf33ca7827af8afc3d11fe03ba462797c0e173071214fbb791d497afb6ffe6577c9eca7a41577da2c51acdc88014d4587d4
diff --git a/dev-python/xlutils/xlutils-1.5.1.ebuild b/dev-python/xlutils/xlutils-1.5.1.ebuild
index ca2868e..0ec869c 100644
--- a/dev-python/xlutils/xlutils-1.5.1.ebuild
+++ b/dev-python/xlutils/xlutils-1.5.1.ebuild
@@ -6,6 +6,7 @@ EAPI=4
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS=1
 RESTRICT_PYTHON_ABIS="3.*"
+#DISTUTILS_SRC_TEST=setup.py
 inherit distutils
 
 DESCRIPTION="provides a collection of utilities for working with Excel files"
@@ -20,8 +21,24 @@ SLOT="0"
 
 DOCS=( xlutils/readme.txt )
 
-RDEPEND="dev-python/xlwt
-	dev-python/xlrd
+RDEPEND=">=dev-python/xlwt-0.7.3
+	>=dev-python/xlrd-0.7.3
 	dev-python/errorhandler"
 DEPEND="${RDEPEND}
-	dev-python/testfixtures"
+	>=dev-python/testfixtures-1.6.1
+	dev-python/mock"
+
+src_test() {
+	# https://github.com/python-excel/xlutils/issues/1
+	testing() {
+		pushd xlutils/tests > /dev/null
+		local exit_status=0
+		for test in test_*.py
+		do
+#			PYTHONPATH="${S}":"${S}"/xlutils/tests/ nosetests $test
+			nosetests $test
+		done
+		popd > /dev/null
+	}
+	python_execute_function testing
+}
diff --git a/dev-python/xlutils/xlutils-1.5.2.ebuild b/dev-python/xlutils/xlutils-1.5.2.ebuild
new file mode 100644
index 0000000..e0ea557
--- /dev/null
+++ b/dev-python/xlutils/xlutils-1.5.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="3.*"
+#DISTUTILS_SRC_TEST=setup.py
+inherit distutils
+
+DESCRIPTION="provides a collection of utilities for working with Excel files"
+HOMEPAGE="http://pypi.python.org/pypi/xlutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+DOCS=( xlutils/readme.txt )
+
+RDEPEND=">=dev-python/xlwt-0.7.3
+	>=dev-python/xlrd-0.7.3
+	dev-python/errorhandler"
+DEPEND="${RDEPEND}
+	>=dev-python/testfixtures-1.6.1
+	dev-python/mock"
+
+src_test() {
+	# https://github.com/python-excel/xlutils/issues/1
+	testing() {
+		pushd xlutils/tests > /dev/null
+		local exit_status=0
+		for test in test_*.py
+		do
+			PYTHONPATH="${S}":"${S}"/xlutils/tests/ nosetests $test
+#			nosetests $test
+		done
+		popd > /dev/null
+	}
+	python_execute_function testing
+}