[gentoo-commits] dev/dev-zero:master commit in: dev-util/cookiecutter/, dev-python/ruamel-base/, dev-python/ruamel-yaml/, ...

[Tiziano Müller]

commit:     bc70f9576b1254efa909ff1dd7f02c3c922988b6
Author:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 14:33:07 2015 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 14:33:07 2015 +0000
URL:        https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=bc70f957

dev-util/cookiecutter: add ruamel-yaml & co. for python-3 support

 dev-python/ruamel-base/Manifest                    |  1 +
 dev-python/ruamel-base/ruamel-base-1.0.0.ebuild    | 31 +++++++++++
 dev-python/ruamel-ordereddict/Manifest             |  1 +
 .../ruamel-ordereddict-0.4.9.ebuild                | 41 +++++++++++++++
 dev-python/ruamel-yaml/Manifest                    |  1 +
 dev-python/ruamel-yaml/ruamel-yaml-0.10.12.ebuild  | 60 ++++++++++++++++++++++
 dev-util/cookiecutter/cookiecutter-1.3.0.ebuild    |  5 +-
 7 files changed, 137 insertions(+), 3 deletions(-)

diff --git a/dev-python/ruamel-base/Manifest b/dev-python/ruamel-base/Manifest
new file mode 100644
index 0000000..60841a8
--- /dev/null
+++ b/dev-python/ruamel-base/Manifest
@@ -0,0 +1 @@
+DIST ruamel.base-1.0.0.tar.gz 5219 SHA256 c041333a0f0f00cd6593eb36aa83abb1a9e7544e83ba7a42aa7ac7476cee5cf3 SHA512 a847f0ae8d889bbc593f6d3507b3208c69d3027a73dddc39058e6da7316937234ef0208394e264a07fd3fa970c97713a14db7a62e374433a27625932bb76c44c WHIRLPOOL e3b5c58242f85559880215e2133dc28c3d17dd6aedddd2c76d29e5bc45ff12965f7d2119704e0774ce290b93b4527befa95e0689ce45b274a9167a3124c2f79f

diff --git a/dev-python/ruamel-base/ruamel-base-1.0.0.ebuild b/dev-python/ruamel-base/ruamel-base-1.0.0.ebuild
new file mode 100644
index 0000000..80d4447
--- /dev/null
+++ b/dev-python/ruamel-base/ruamel-base-1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+MY_PN="ruamel.base"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="common routines for ruamel packages"
+HOMEPAGE="https://pypi.python.org/pypi/ruamel.base"
+SRC_URI="mirror://pypi/r/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+}

diff --git a/dev-python/ruamel-ordereddict/Manifest b/dev-python/ruamel-ordereddict/Manifest
new file mode 100644
index 0000000..3d20fa9
--- /dev/null
+++ b/dev-python/ruamel-ordereddict/Manifest
@@ -0,0 +1 @@
+DIST ruamel.ordereddict-0.4.9.tar.gz 53707 SHA256 7058c470f131487a3039fb9536dda9dd17004a7581bdeeafa836269a36a2b3f6 SHA512 556988c457b60b8763b4eeffad4a8f44d96c22f8aca702ac6f883bd9ddf13af38aa46f804f95e256b900f9f25e473beb1c86a62f6da66d19ca770878dc8ca3ca WHIRLPOOL 7e442d946fb378ed46be3b7b695166708e83bfbc1d28867ef8f902b7c64417d3512c18a19b5a0d63b83c23d6016d1e3f2358956f67fb8246934d6fa97a39ac18

diff --git a/dev-python/ruamel-ordereddict/ruamel-ordereddict-0.4.9.ebuild b/dev-python/ruamel-ordereddict/ruamel-ordereddict-0.4.9.ebuild
new file mode 100644
index 0000000..2b7a5c6
--- /dev/null
+++ b/dev-python/ruamel-ordereddict/ruamel-ordereddict-0.4.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="ruamel.ordereddict"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="a version of dict that keeps keys in insertion resp. sorted order"
+HOMEPAGE="https://pypi.python.org/pypi/ruamel.ordereddict"
+SRC_URI="mirror://pypi/r/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/ruamel-base[${PYTHON_USEDEP}]"
+DEPEND="${RDEPED}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -i -e 's|from ruamel.ordereddict|from _ordereddict|' \
+		test/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Run tests with verbose output failing on the first failing test.
+python_test() {
+	py.test -vvx test || die
+}

diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
new file mode 100644
index 0000000..d293c31
--- /dev/null
+++ b/dev-python/ruamel-yaml/Manifest
@@ -0,0 +1 @@
+DIST ruamel.yaml-0.10.12.tar.gz 234712 SHA256 2bfd7d00c0ca859dbf1a7abca79969eedd25c76a976b7d40f94e1891a6e73f2c SHA512 f7f6f91101cb1cf1b849c5c1bb64fc07fb2791f55ef81e4c752fcfbd98de59ab0fc861c5e06b30a4d579affe77e4532b079d35cd86f14a14e7f4e6704d7d0cb2 WHIRLPOOL e2e59c41ca643e8f7b5244509e5789efe73c531c9ffdaee9f2f4c0d3685495327a36804cae20c184fa7a94787e9db35a654046d9bd86318cf1fc25c91ced5631

diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.10.12.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.10.12.ebuild
new file mode 100644
index 0000000..09bff93
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.10.12.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+#FIXME: While ruamel.yaml technically supports Python 2.7, such support
+#conditionally requires an additional as-yet-unimplemented ebuild:
+#"ruamel.ordereddict". On adding such ebuild to the overlay, add "python2_7"
+#back to ${PYTHON_COMPAT} below *AND* add the following conditional
+#dependency to ${RDEPEND}:
+#    $(python_gen_cond_dep 'dev-python/ruamel_ordereddict[${PYTHON_USEDEP}]' 'python2*'
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="ruamel.yaml"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.python.org/pypi/ruamel.yaml"
+SRC_URI="mirror://pypi/r/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libyaml test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# the roundtrip.py is currently missing from the tarball
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/ruamel-base[${PYTHON_USEDEP}]
+	libyaml? ( dev-libs/libyaml )
+	$(python_gen_cond_dep 'dev-python/ruamel-ordereddict[${PYTHON_USEDEP}]' python2_7)"
+
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+DOCS="README.rst"
+
+python_configure_all() {
+	if ! use libyaml ; then
+		sed -i -e 's|\(ext_modules\)|no_\1|' __init__.py || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+}
+
+# Run tests with verbose output failing on the first failing test.
+python_test() {
+	py.test -vvx test
+}

diff --git a/dev-util/cookiecutter/cookiecutter-1.3.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.3.0.ebuild
index 9417719..701c26a 100644
--- a/dev-util/cookiecutter/cookiecutter-1.3.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.3.0.ebuild
@@ -18,12 +18,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 
-#RESTRICT="test" # tests currently fail here
-
 RDEPEND=">=dev-python/binaryornot-0.2.0[${PYTHON_USEDEP}]
 	>=dev-python/future-0.15.2[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '>=dev-python/ruamel-yaml-0.10.12[${PYTHON_USEDEP}]' 'python3*')
 	>=dev-python/click-4.0[${PYTHON_USEDEP}]
 	>=dev-python/whichcraft-0.1.1[${PYTHON_USEDEP}]"