summaryrefslogtreecommitdiff
path: root/dev-python
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/hypothesis/hypothesis-1.19.0.ebuild2
-rw-r--r--dev-python/ipyparallel/Manifest1
-rw-r--r--dev-python/ipyparallel/ipyparallel-5.0.0.ebuild58
-rw-r--r--dev-python/ipython/Manifest1
-rw-r--r--dev-python/ipython/ipython-4.1.1.ebuild137
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild2
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild82
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild2
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild87
-rw-r--r--dev-python/libvirt-python/Manifest1
-rw-r--r--dev-python/libvirt-python/libvirt-python-1.3.1.ebuild44
-rw-r--r--dev-python/mimeparse/Manifest2
-rw-r--r--dev-python/mimeparse/mimeparse-1.5.1.ebuild (renamed from dev-python/mimeparse/mimeparse-1.5.ebuild)0
-rw-r--r--dev-python/networkx/networkx-1.10-r1.ebuild8
-rw-r--r--dev-python/networkx/networkx-1.10.ebuild11
-rw-r--r--dev-python/networkx/networkx-1.11.ebuild6
-rw-r--r--dev-python/nose/Manifest2
-rw-r--r--dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch17
-rw-r--r--dev-python/nose/files/nose-1.2.1-skiptest.patch23
-rw-r--r--dev-python/nose/files/nose-1.3.1-doctest.patch45
-rw-r--r--dev-python/nose/files/nose-1.3.1-pypy-test.patch42
-rw-r--r--dev-python/nose/files/nose-1.3.1-python3.4.patch41
-rw-r--r--dev-python/nose/files/nose-1.3.1-version.patch16
-rw-r--r--dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch54
-rw-r--r--dev-python/nose/nose-1.3.4.ebuild77
-rw-r--r--dev-python/nose/nose-1.3.6.ebuild82
-rw-r--r--dev-python/nose/nose-1.3.7-r1.ebuild (renamed from dev-python/nose/nose-1.3.7.ebuild)14
-rw-r--r--dev-python/nose/nose-9999.ebuild58
-rw-r--r--dev-python/numpy/numpy-1.10.4.ebuild3
-rw-r--r--dev-python/pip/pip-8.0.2-r1.ebuild1
-rw-r--r--dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild2
-rw-r--r--dev-python/pyrsistent/pyrsistent-0.11.11.ebuild2
-rw-r--r--dev-python/rpy/Manifest1
-rw-r--r--dev-python/rpy/rpy-2.7.8.ebuild53
-rw-r--r--dev-python/setuptools/Manifest1
-rw-r--r--dev-python/setuptools/setuptools-19.7.ebuild57
-rw-r--r--dev-python/testtools/Manifest1
-rw-r--r--dev-python/testtools/testtools-2.0.0.ebuild52
-rw-r--r--dev-python/theano/Manifest1
-rw-r--r--dev-python/theano/theano-0.6.0.ebuild11
-rw-r--r--dev-python/theano/theano-0.7.0.ebuild47
41 files changed, 579 insertions, 568 deletions
diff --git a/dev-python/hypothesis/hypothesis-1.19.0.ebuild b/dev-python/hypothesis/hypothesis-1.19.0.ebuild
index 451c324f48..2e3b074556 100644
--- a/dev-python/hypothesis/hypothesis-1.19.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-1.19.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 4f66c23536..4d02d6d6c5 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1 +1,2 @@
DIST ipyparallel-4.1.0.tar.gz 2271608 SHA256 c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a SHA512 19fff1ea57d9fcaec6525ce6e0c72ab63ab1245e32e485174a0691d2b48d8d2512af4055b77df82c7b30a8c071e1b6c5900d37e992f82f1597492e220e83d36f WHIRLPOOL ead35bc2166af0b221e730550689b09b7bf04148abcd754039f1c511acaa182ba50b593372f3e8bc627ae40a6117f9209cac476c1905bdc780f53de10666ffe1
+DIST ipyparallel-5.0.0.tar.gz 2286751 SHA256 ffa7e2e29fdc4844b3c1721f46b42eee5a1abe5cbb851ccf79d0f4f89b9fe21a SHA512 ef04b717198246300ad1020eb7f9a65c40553a897653384bd839d5fb05409a276df41f933b0f023c0523fc6d8cebf6e2c6f8478c8be4fe4fdf386ad78b8f4418 WHIRLPOOL 677fd7fa2090b2b75c234c4802fab553105d2e3ce44ab4c390cadc56ba5ff3814005ab478906197d6a9f862e0d69901168d22cdc44c8063cf8e71fc8f8bdc449
diff --git a/dev-python/ipyparallel/ipyparallel-5.0.0.ebuild b/dev-python/ipyparallel/ipyparallel-5.0.0.ebuild
new file mode 100644
index 0000000000..8bf04a1ec2
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-5.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+ dev-python/ipython_genutils[${PYTHON_USEDEP}]
+ dev-python/decorator[${PYTHON_USEDEP}]
+ >=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ !<dev-python/ipython-4.0.0[smp]
+ >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+ dev-python/jupyter_client[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ )
+ "
+
+python_prepare_all() {
+ # Prevent un-needed download during build
+ if use doc; then
+ sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ iptest ipyparallel.tests -- -vsx || die
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( docs/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 6451464b21..af332b8d15 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,3 +1,4 @@
DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1
DIST ipython-4.0.1.tar.gz 6207566 SHA256 3bd3b78abc4f43b9ea7fa5353a2a9ba01af8ac4aec5d11e78fa5cbcec105432e SHA512 88419feca21c762a8553b4c11661e28b3305742fc89309abfd46b1213da210249b4781b754996835a2cc539569ae7cb816ed26bbaddbf15529eeb6479660265e WHIRLPOOL 58c17378fbcbac94e1585cce0cdd00996f7df20f5781a88e1e7d56b9fe2db81fe3282211dba31e8f54d2e50db869d2cce2670cfebc5c868455f481064e0089c6
DIST ipython-4.0.3.tar.gz 6207899 SHA256 3a928f59e8ac8dd97858c28390867c87c09510f1f8bbe97e4e9c6b036eb84fc0 SHA512 1e2deb597348757e69aaeadd0632cf984056e5f7278ee5bbbd7b4233581323b07f55685b1891c23dc0977d9f30f7dc734dcf2216bc8876424cdb0f7a9294fecf WHIRLPOOL 1beb60e6daf3cea4609318e87a07307843eeb1002847f8c3c5fbe8e114ab29cb052c810884b410f1e8414437b91c5335048106756e2d88a82a7e440e3ff8fc17
+DIST ipython-4.1.1.tar.gz 4938684 SHA256 1cb340dfdf6ec306b9ded72071742c87fa5247929db7ab704e17defe1975e38f SHA512 ccb24a6d3de5f12a21225387e46ad1b1038910d51d8c0aeb1f4ad6d24751b300295548083f60f3eadec3f29c75370644638b30e6ce391d13f900454e8b3d60a5 WHIRLPOOL f041d10747d4919566a0119e25bfd9030d6213021ecd222bad9e456a7cb3505ee5d3ffc7fe0de5aa1080453565245c3e95cb774df0746f7d4a13b51067bc53b9
diff --git a/dev-python/ipython/ipython-4.1.1.ebuild b/dev-python/ipython/ipython-4.1.1.ebuild
new file mode 100644
index 0000000000..3c9b5dae54
--- /dev/null
+++ b/dev-python/ipython/ipython-4.1.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
+
+REQUIRED_USE="
+ test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
+ doc? ( mongodb )"
+
+CDEPEND="
+ dev-python/decorator[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pickleshare[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/simplegeneric[${PYTHON_USEDEP}]
+ dev-python/traitlets[${PYTHON_USEDEP}]
+ matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+ mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
+ wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
+
+RDEPEND="${CDEPEND}
+ notebook? (
+ dev-python/notebook[${PYTHON_USEDEP}]
+ dev-python/ipywidgets[${PYTHON_USEDEP}]
+ )
+ nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
+ qt4? ( dev-python/qtconsole )"
+DEPEND="${CDEPEND}
+ >=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
+ test? (
+ app-text/dvipng
+ dev-python/jinja[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+ >=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/testpath[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+ x11-base/xorg-server[xvfb]
+ )
+ doc? (
+ dev-python/cython[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
+ >=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ >=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+ dev-python/rpy[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+ )"
+
+PDEPEND="
+ smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/2.1.0-substitute-files.patch
+ )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+ # Remove out of date insource files
+ rm IPython/extensions/rmagic.py || die
+
+ # Prevent un-needed download during build
+ if use doc; then
+ sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html_noapi
+}
+
+python_test() {
+ distutils_install_for_testing
+ # https://github.com/ipython/ipython/issues/8639
+ # Failure of some modules only in python3.4
+ local fail
+ run_tests() {
+ pushd ${TEST_DIR} > /dev/null || die
+ "${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
+ popd > /dev/null || die
+ }
+ VIRTUALX_COMMAND=run_tests virtualmake
+ [[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ # Create ipythonX.Y symlinks.
+ # TODO:
+ # 1. do we want them for pypy? No. pypy has no numpy
+ # 2. handle it in the eclass instead (use _python_ln_rel).
+ # With pypy not an option the dosym becomes unconditional
+ dosym ../lib/python-exec/${EPYTHON}/ipython \
+ /usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "sympyprinting" dev-python/sympy
+ optfeature "cythonmagic" dev-python/cython
+ optfeature "%lprun magic command" dev-python/line_profiler
+ optfeature "%mprun magic command" dev-python/memory_profiler
+ if use nbconvert; then
+ if ! has_version app-text/pandoc ; then
+ einfo "Node.js will be used to convert notebooks to other formats"
+ einfo "like HTML. Support for that is still experimental. If you"
+ einfo "encounter any problems, please use app-text/pandoc instead."
+ fi
+ fi
+}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
index d0ea157ad8..c56c57bf18 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
deleted file mode 100644
index cad25cd5ed..0000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
- >=dev-python/mock-1.2[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
- >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- testr init
- testr run || die "testsuite failed under python2.7"
- flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- use examples && local EXAMPLES=( examples/.)
- distutils-r1_python_install_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
index acea64e724..ef7504473e 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild
deleted file mode 100644
index 6a2c3c7142..0000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
- >=dev-python/mock-1.2[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
- >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
- >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
- !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
- !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- testr init
- testr run || die "testsuite failed under python2.7"
- flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- use examples && local EXAMPLES=( examples/.)
- distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 338a2aceb0..143007ca67 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,2 +1,3 @@
DIST libvirt-python-1.2.21.tar.gz 171250 SHA256 7ffb49fcb64ac06188fc626c853c99361e5965766ab020f8ea66f8fbcfc29684 SHA512 7e2481ffa26105ddde703bd6eafe74240b69990b2f2ce0042f20f7fceb1d326fb8a66bf26042bfe63a12cf3202d7c19b14b6d766dd42fb66af212393d7aaf332 WHIRLPOOL 18dd5bc0d565b6846c40960cf258d7fb3714054be15fe54507e2846c5a7c2cd81e9b209c8e70cbfd5319d5a06f00c2c5322995058637af87d1676276f8675b2e
DIST libvirt-python-1.3.0.tar.gz 171195 SHA256 097d41bc52c300e50c5b04836e078bae5653fe222db92a9a10839f3e6b3afc7c SHA512 b207aa9aef63e7d1a8377b2f8a0fa8dc05893bd744672c2b41f4dafa2516cbddd2868f37b0caf72b125fccbbf56542fcf1b94b452c406757f30d8f02d6ee26b4 WHIRLPOOL 1bde1fd130e0760bfa8f62c2f85e4ded991fc0eadcaf10b38bbbcf754eaa7b3a0ccb72f304f65457115419e4d3d904d07172e33bd68d581a29e4fb8d0703b45a
+DIST libvirt-python-1.3.1.tar.gz 171221 SHA256 7143b922a9bd66a5e199b13316fa4266cbffc23db01c99bce37216a1eb9118f7 SHA512 f980d6aec1c83422d01c8ff02915357f4903f8c2a8ea9538da35e7313f6d491ebb4646e642097269a6be2996da879e7594c5e166cf2cc0bd96745eace7ce7567 WHIRLPOOL 3fe0ecba5f618eab1059c5e4ac4ef8789ed6684f36aee336f2e366198805560706c41d67ddceb328a0ad66867145a103aa15665b646b7bc5a5b058b02755ce11
diff --git a/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild
new file mode 100644
index 0000000000..cc59d1ba63
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+ SRC_URI=""
+ KEYWORDS=""
+ RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+ SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="http://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}] )"
+
+# testsuite is currently not included in upstream tarball
+RESTRICT="test"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
index 451d25f797..830b451203 100644
--- a/dev-python/mimeparse/Manifest
+++ b/dev-python/mimeparse/Manifest
@@ -1,2 +1,2 @@
DIST python-mimeparse-0.1.4.tar.gz 5228 SHA256 3c69a21e37e77f754e6fc09ebda70acd92c90d8a58f29a41cc0248351378ddc3 SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3 WHIRLPOOL f83328743b16ae46263e05055d6400617b7858e11837ce892919e26a36348650122b78ee366125a1793b20fa71c641b3606bf834d2936f98dab65b89b740385b
-DIST python-mimeparse-1.5.tar.gz 5827 SHA256 9518ff1576d60e99f310116711beda6974f18caa3deb01c73d25bab409408878 SHA512 799b40c0128f22949869bc55f618b46f022bf937cd59be21343dab3d3d977cc24d84744dcbd23da4efb135e940a1373f064ec6e56e8bd4188fa54a3107d2718f WHIRLPOOL b9c9748c24ff931c2c3a2ae4da088818f9a7018be6450783c3ac0ff533e7292b23a5e94cff976b3209003a481240a5a4af65c7d6b81753b80e200b0fc5a0c03d
+DIST python-mimeparse-1.5.1.tar.gz 5822 SHA256 e4d0c49120f5d946106ed3a6fed0b353740c0c9700b57d7d024c65466e50a106 SHA512 bd25dd43ba98ac8e10e02d21ae040be76b0a2ae3904333c6bbf8d46e4f12bda84eb410059b22a345b6840af2c055802b31c3f76c46f133c1c11673a4f15f21f7 WHIRLPOOL a31cd0a78ba86a16d335ece4a226981dce813399e0695ce577d6fa8f327e6cf88c5723f69600f5852cde2d1a66ccb49aac1b8ada3854e1fe8f33a073a8ebb27c
diff --git a/dev-python/mimeparse/mimeparse-1.5.ebuild b/dev-python/mimeparse/mimeparse-1.5.1.ebuild
index 0d1ed5a004..0d1ed5a004 100644
--- a/dev-python/mimeparse/mimeparse-1.5.ebuild
+++ b/dev-python/mimeparse/mimeparse-1.5.1.ebuild
diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild
index 9770aae4be..b6b73f9cfe 100644
--- a/dev-python/networkx/networkx-1.10-r1.ebuild
+++ b/dev-python/networkx/networkx-1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,6 +17,8 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples test"
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
COMMON_DEPEND="
dev-python/matplotlib[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]"
@@ -42,6 +44,10 @@ RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
)"
+pkg_setup() {
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
python_prepare_all() {
# Avoid d'loading of file objects.inv from 2 sites of python docs
sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
diff --git a/dev-python/networkx/networkx-1.10.ebuild b/dev-python/networkx/networkx-1.10.ebuild
index 95ff6a288d..23f681f815 100644
--- a/dev-python/networkx/networkx-1.10.ebuild
+++ b/dev-python/networkx/networkx-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,10 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples test"
-COMMON_DEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+COMMON_DEPEND="
+ dev-python/matplotlib[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
@@ -41,6 +44,10 @@ RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
)"
+pkg_setup() {
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
python_prepare_all() {
# Avoid d'loading of file objects.inv from 2 sites of python docs
sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index 4508dcd7d8..0c221742b5 100644
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -17,6 +17,8 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples test"
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
COMMON_DEPEND="
dev-python/matplotlib[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]"
@@ -42,6 +44,10 @@ RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
)"
+pkg_setup() {
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
python_prepare_all() {
# Avoid d'loading of file objects.inv from 2 sites of python docs
sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 1afef6aee3..3f45f5adc5 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -1,3 +1 @@
-DIST nose-1.3.4.tar.gz 277488 SHA256 76bc63a4e2d5e5a0df77ca7d18f0f56e2c46cfb62b71103ba92a92c79fab1e03 SHA512 19499ab08018229ea5195cdac739d6c7c247c5aa5b2c91b801cbd99bad12584ed84c5cfaaa6fa8b4893a46324571a2f8a1988a1381f4ddd58390e597bd7bdc24 WHIRLPOOL 10c3938913e0bfcbb20a7822feadd751c2c1db76d97bf0a5ecbe83be81934a5a23aad4d37a77c68d6da5ac80bdb274f56e2ee3206fb97f96832271d479ca7302
-DIST nose-1.3.6.tar.gz 276273 SHA256 f61e0909a743eed37b1207e38a8e7b4a2fe0a82185e36f2be252ef1b3f901758 SHA512 d0cede08dc33a8ac0af0f18063e57f31b615f06e911edb5ca264575174d8f4adb4338448968c403811d9dcc60f38ade3164662d6c7b69b499f56f0984bb6283c WHIRLPOOL d7360c24aad388c736ce08578eb7ca529873a8603dc0b8e4c79d7756a6d5f6429561b3b8beffc2930301a48767ded06fb3127c27c07432cb25a0549556cb74fe
DIST nose-1.3.7.tar.gz 280488 SHA256 f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62 WHIRLPOOL 68684b12e18d41b1f49ba3e832adf8a03b3b84ce530f0bde34f8c40c84f38046aac2777090472fefe87ba7abe3fdffa4cdcad74e3b717fcb9dfe932a0657b965
diff --git a/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch b/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch
deleted file mode 100644
index 5ce5a1db88..0000000000
--- a/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/conf.py.orig 2009-05-07 03:12:35.000000000 +0200
-+++ doc/conf.py 2009-05-13 10:13:12.588540888 +0200
-@@ -31,7 +31,7 @@
-
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
-+extensions = ['sphinx.ext.autodoc',
- 'nose.sphinx.pluginopts', 'manbuilder']
-
- # Add any paths that contain templates here, relative to this directory.
-@@ -231,4 +231,4 @@
-
-
- # Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/dev': None}
-+#intersphinx_mapping = {'http://docs.python.org/dev': None}
diff --git a/dev-python/nose/files/nose-1.2.1-skiptest.patch b/dev-python/nose/files/nose-1.2.1-skiptest.patch
deleted file mode 100644
index b8f7a57f4d..0000000000
--- a/dev-python/nose/files/nose-1.2.1-skiptest.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Tests are set to compulsory fail, cannot be set to expectedFailure
-diff -ur nose-1.2.1.orig/functional_tests/test_program.py nose-1.2.1/functional_tests/test_program.py
---- functional_tests/test_program.py 2011-12-14 22:01:38.000000000 +0800
-+++ functional_tests/test_program.py 2013-03-02 14:50:28.628004408 +0800
-@@ -1,5 +1,8 @@
--import os
--import unittest
-+import os, sys
-+if sys.version_info[:2] == (2, 7) or hasattr(sys, 'pypy_version_info'):
-+ import unittest
-+else:
-+ import unittest2 as unittest
- from cStringIO import StringIO
- from nose import SkipTest
- from nose.core import TestProgram
-@@ -91,6 +91,7 @@
- assert not res.errors
- assert not res.failures
-
-+ @unittest.skip("tests set to exit with compulsory fail, error")
- def test_run_support_twist(self):
- """Collect and run tests in functional/support/twist
-
diff --git a/dev-python/nose/files/nose-1.3.1-doctest.patch b/dev-python/nose/files/nose-1.3.1-doctest.patch
deleted file mode 100644
index 37d0dcced9..0000000000
--- a/dev-python/nose/files/nose-1.3.1-doctest.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/nose-devs/nose/commit/5bcedc9a0601b4f70e2cba6c14c3046fb326bfaa.diff
-diff --git a/unit_tests/test_config_defaults.rst b/unit_tests/test_config_defaults.rst
-index 944d370..034f58e 100644
---- a/unit_tests/test_config_defaults.rst
-+++ b/unit_tests/test_config_defaults.rst
-@@ -89,9 +89,9 @@ Invalid config files
-
- (file-like object)
-
-- >>> options, args = parse([], StringIO("spam"))
-+ >>> options, args = parse([], StringIO("spam")) # doctest: +ELLIPSIS
- error: Error reading config file '<???>': File contains no section headers.
-- file: <???>, line: 1
-+ file: ...<???>..., line: 1
- 'spam'
-
- (filename)
-@@ -99,7 +99,7 @@ Invalid config files
- >>> options, args = parse([], os.path.join(support, "invalid.cfg"))
- ... # doctest: +ELLIPSIS
- error: Error reading config file '...invalid.cfg': File contains no section headers.
-- file: ...invalid.cfg, line: 1
-+ file: ...invalid.cfg..., line: 1
- 'spam\n'
-
- (filenames, length == 1)
-@@ -107,7 +107,7 @@ Invalid config files
- >>> options, args = parse([], [os.path.join(support, "invalid.cfg")])
- ... # doctest: +ELLIPSIS
- error: Error reading config file '...invalid.cfg': File contains no section headers.
-- file: ...invalid.cfg, line: 1
-+ file: ...invalid.cfg..., line: 1
- 'spam\n'
-
- (filenames, length > 1)
-@@ -120,7 +120,7 @@ file is bad
- ... os.path.join(support, "b.cfg")])
- ... # doctest: +ELLIPSIS
- error: Error reading config file '...invalid.cfg': File contains no section headers.
-- file: ...invalid.cfg, line: 1
-+ file: ...invalid.cfg..., line: 1
- 'spam\n'
-
-
-
diff --git a/dev-python/nose/files/nose-1.3.1-pypy-test.patch b/dev-python/nose/files/nose-1.3.1-pypy-test.patch
deleted file mode 100644
index 41ad4687c8..0000000000
--- a/dev-python/nose/files/nose-1.3.1-pypy-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/nose-devs/nose/commit/0181572a64195a8fa1c6c867ae6c61a79a9606ca.diff
-
-diff --git a/nose/util.py b/nose/util.py
-index dcb5fef..e612696 100644
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -447,11 +447,10 @@ def try_run(obj, names):
- if func is not None:
- if type(obj) == types.ModuleType:
- # py.test compatibility
-- try:
-- args, varargs, varkw, defaults = inspect.getargspec(func)
-- if hasattr(func, '__call__') and ismethod(func.__call__):
-- args.pop(0)
-- except TypeError:
-+ if isinstance(func, types.FunctionType):
-+ args, varargs, varkw, defaults = \
-+ inspect.getargspec(func)
-+ else:
- # Not a function. If it's callable, call it anyway
- if hasattr(func, '__call__'):
- func = func.__call__
-diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
-index 2bd837c..cd9ba6e 100644
---- a/unit_tests/test_utils.py
-+++ b/unit_tests/test_utils.py
-@@ -1,4 +1,5 @@
- import os
-+import sys
- import unittest
- import nose
- from nose import case
-@@ -168,7 +169,7 @@ def __call__(self):
- class Bar_m:
- def __call__(self, mod):
- pass
--
-+
- foo = imp.new_module('foo')
- foo.bar = bar
- foo.bar_m = bar_m
-
diff --git a/dev-python/nose/files/nose-1.3.1-python3.4.patch b/dev-python/nose/files/nose-1.3.1-python3.4.patch
deleted file mode 100644
index 2269f755c3..0000000000
--- a/dev-python/nose/files/nose-1.3.1-python3.4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 192694ed9f70447317bd54e427a17208bddf03be Mon Sep 17 00:00:00 2001
-From: John Szakmeister <john@szakmeister.net>
-Date: Sat, 15 Mar 2014 06:15:42 -0400
-Subject: [PATCH] Fix #783: try_run is broken with Python 3.4
-
-It turns out that we expected inspect.getargspec() to only work on
-functions (versus classes that are callable). Python 3.4 has changed
-this behavior and now happily returns the arg spec. Let's try to detect
-this situation by checking the __call__() method to if it's actually the
-method of a class. If so, pop the 'self' argument off of args--similar
-to what's done in the exceptional case below.
----
- CHANGELOG | 1 +
- nose/util.py | 4 +++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/nose/util.py b/nose/util.py
-index 7995700..dcb5fef 100644
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -8,7 +8,7 @@
- import sys
- import types
- import unittest
--from nose.pyversion import ClassType, TypeType, isgenerator
-+from nose.pyversion import ClassType, TypeType, isgenerator, ismethod
-
-
- log = logging.getLogger('nose')
-@@ -449,6 +449,8 @@ def try_run(obj, names):
- # py.test compatibility
- try:
- args, varargs, varkw, defaults = inspect.getargspec(func)
-+ if hasattr(func, '__call__') and ismethod(func.__call__):
-+ args.pop(0)
- except TypeError:
- # Not a function. If it's callable, call it anyway
- if hasattr(func, '__call__'):
---
-1.8.5.5
-
diff --git a/dev-python/nose/files/nose-1.3.1-version.patch b/dev-python/nose/files/nose-1.3.1-version.patch
deleted file mode 100644
index 8f6edb5be2..0000000000
--- a/dev-python/nose/files/nose-1.3.1-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/nose-devs/nose/commit/43c35e49106916f51f676455888fe7a39d030113.diff
-diff --git a/nose/pyversion.py b/nose/pyversion.py
-index fba5ada..8b56614 100644
---- a/nose/pyversion.py
-+++ b/nose/pyversion.py
-@@ -89,7 +89,8 @@ def __init__(self, cls, func):
- self.__dict__ = func.__dict__.copy()
- self._func = func
- self.__self__ = UnboundSelf(cls)
-- self.im_class = cls
-+ if sys.version_info < (3, 0):
-+ self.im_class = cls
-
- def address(self):
- cls = self.__self__.cls
-
diff --git a/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
new file mode 100644
index 0000000000..8d2f2f05dc
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
@@ -0,0 +1,54 @@
+From 8e7ad3d50012688ca029d126cbc88251831fea88 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Mon, 1 Feb 2016 00:05:30 +0300
+Subject: [PATCH 1/2] Set __qualname__ equal to __name__ on derived classes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To make output on Python ≥ 3.5 the same as on previous Python versions.
+
+This fixes #928.
+---
+ functional_tests/test_load_tests_from_test_case.py | 1 +
+ nose/util.py | 1 +
+ unit_tests/test_xunit.py | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py
+index 42f8563..13d0c8a 100644
+--- a/functional_tests/test_load_tests_from_test_case.py
++++ b/functional_tests/test_load_tests_from_test_case.py
+@@ -29,6 +29,7 @@ def setUp(self):
+ pass
+ def tearDown(self):
+ pass
++ Derived.__qualname__ = Derived.__name__
+ # must use nose loader here because the default loader in 2.3
+ # won't load tests from base classes
+ l = loader.TestLoader()
+diff --git a/nose/util.py b/nose/util.py
+index bfe1658..80ab1d4 100644
+--- a/nose/util.py
++++ b/nose/util.py
+@@ -643,6 +643,7 @@ class C(cls):
+ pass
+ C.__module__ = module
+ C.__name__ = cls.__name__
++ C.__qualname__ = cls.__name__
+ return C
+
+
+diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py
+index 944d285..261436b 100644
+--- a/unit_tests/test_xunit.py
++++ b/unit_tests/test_xunit.py
+@@ -16,6 +16,7 @@ def mktest():
+ class TC(unittest.TestCase):
+ def runTest(self):
+ pass
++ TC.__qualname__ = TC.__name__
+ test = TC()
+ return test
+
+
diff --git a/dev-python/nose/nose-1.3.4.ebuild b/dev-python/nose/nose-1.3.4.ebuild
deleted file mode 100644
index 6d77007c15..0000000000
--- a/dev-python/nose/nose-1.3.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="https://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://bitbucket.org/jpellerin/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
- test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-
-python_prepare_all() {
- # Tests need to be converted, and they don't respect BUILD_DIR.
- use test && DISTUTILS_IN_SOURCE_BUILD=1
-
- # Disable tests requiring network connection.
- sed \
- -e "s/test_resolve/_&/g" \
- -e "s/test_raises_bad_return/_&/g" \
- -e "s/test_raises_twisted_error/_&/g" \
- -i unit_tests/test_twisted.py || die "sed failed"
- # Disable versioning of nosetests script to avoid collision with
- # versioning performed by the eclass.
- sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
- -i setup.py || die "sed2 failed"
-
- # Prevent un-needed d'loading during doc build
- sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- local add_targets=()
-
- if use test; then
- add_targets+=( egg_info )
- python_is_python3 && add_targets+=( build_tests )
- fi
-
- distutils-r1_python_compile ${add_targets[@]}
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-
- if use doc; then
- dohtml -r -A txt doc/.build/html/.
- fi
-}
diff --git a/dev-python/nose/nose-1.3.6.ebuild b/dev-python/nose/nose-1.3.6.ebuild
deleted file mode 100644
index fe1725e007..0000000000
--- a/dev-python/nose/nose-1.3.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
- https://pypi.python.org/pypi/nose
- http://readthedocs.org/docs/nose/
- https://bitbucket.org/jpellerin/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-RDEPEND="
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
- test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-
-python_prepare_all() {
- # Tests need to be converted, and they don't respect BUILD_DIR.
- use test && DISTUTILS_IN_SOURCE_BUILD=1
-
- # Disable tests requiring network connection.
- sed \
- -e "s/test_resolve/_&/g" \
- -e "s/test_raises_bad_return/_&/g" \
- -e "s/test_raises_twisted_error/_&/g" \
- -i unit_tests/test_twisted.py || die "sed failed"
- # Disable versioning of nosetests script to avoid collision with
- # versioning performed by the eclass.
- sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
- -i setup.py || die "sed2 failed"
-
- # Prevent un-needed d'loading during doc build
- sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- local add_targets=()
-
- if use test; then
- add_targets+=( egg_info )
- python_is_python3 && add_targets+=( build_tests )
- fi
-
- distutils-r1_python_compile ${add_targets[@]}
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-
- if use doc; then
- dohtml -r -A txt doc/.build/html/.
- fi
-}
diff --git a/dev-python/nose/nose-1.3.7.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
index 26a7859c68..4ef52e3ab0 100644
--- a/dev-python/nose/nose-1.3.7.ebuild
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -18,13 +18,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
REQUIRED_USE="
- doc? (
- || ( $(python_gen_useflags 'python2*') )
- )"
+ doc? ( || ( $(python_gen_useflags 'python2*') ) )"
RDEPEND="
dev-python/coverage[${PYTHON_USEDEP}]
@@ -33,6 +31,8 @@ DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
+PATCHES=( "${FILESDIR}"/${P}-python-3.5-backport.patch )
+
pkg_setup() {
use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
}
@@ -70,10 +70,7 @@ python_compile() {
}
python_compile_all() {
- if use doc; then
- python_setup 'python2*'
- emake -C doc html
- fi
+ use doc && emake -C doc html
}
python_test() {
@@ -88,5 +85,4 @@ python_install_all() {
use examples && local EXAMPLES=( examples/. )
use doc && HTML_DOCS=( doc/.build/html/. )
distutils-r1_python_install_all
-
}
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index fa4b126cf8..67dd10344d 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -2,46 +2,46 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-#if LIVE
-EGIT_REPO_URI="git://github.com/nose-devs/${PN}.git
- https://github.com/nose-devs/${PN}.git"
-inherit git-2
-#endif
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1 eutils
+
+inherit distutils-r1 git-r3
DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="https://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+ https://pypi.python.org/pypi/nose
+ http://readthedocs.org/docs/nose/
+ https://github.com/nose-devs/nose"
+SRC_URI=""
+EGIT_REPO_URI="
+ git://github.com/nose-devs/${PN}.git
+ https://github.com/nose-devs/${PN}.git"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS=""
IUSE="doc examples test"
-RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
+REQUIRED_USE="
+ doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="
+ dev-python/coverage[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
- doc? ( >=dev-python/sphinx-0.6 )
- test? ( dev-python/twisted-core )"
+ doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+ test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-#if LIVE
-SRC_URI=
-KEYWORDS=
-#endif
-
-DOCS=( AUTHORS )
+pkg_setup() {
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
python_prepare_all() {
# Tests need to be converted, and they don't respect BUILD_DIR.
use test && DISTUTILS_IN_SOURCE_BUILD=1
- # Disable sphinx.ext.intersphinx, requires network
- epatch "${FILESDIR}/${PN}-0.11.0-disable_intersphinx.patch"
# Disable tests requiring network connection.
sed \
-e "s/test_resolve/_&/g" \
@@ -53,6 +53,9 @@ python_prepare_all() {
sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-i setup.py || die "sed2 failed"
+ # Prevent un-needed d'loading during doc build
+ sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
distutils-r1_python_prepare_all
}
@@ -61,7 +64,7 @@ python_compile() {
if use test; then
add_targets+=( egg_info )
- [[ ${EPYTHON} == python3* ]] && add_targets+=( build_tests )
+ python_is_python3 && add_targets+=( build_tests )
fi
distutils-r1_python_compile ${add_targets[@]}
@@ -72,7 +75,7 @@ python_compile_all() {
}
python_test() {
- "${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
+ "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
}
python_install() {
@@ -80,10 +83,7 @@ python_install() {
}
python_install_all() {
- local EXAMPLES=( examples/. )
+ use examples && local EXAMPLES=( examples/. )
+ use doc && HTML_DOCS=( doc/.build/html/. )
distutils-r1_python_install_all
-
- if use doc; then
- dohtml -r -A txt doc/.build/html/.
- fi
}
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index 310c4c6458..28b5d196f2 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
# It appears the docs haven't been upgraded, still @ 1.8.1
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RDEPEND="
@@ -114,6 +114,7 @@ python_prepare_all() {
# -i numpy/tests/test_scripts.py || die
distutils-r1_python_prepare_all
+ epatch_user
}
python_compile() {
diff --git a/dev-python/pip/pip-8.0.2-r1.ebuild b/dev-python/pip/pip-8.0.2-r1.ebuild
index f594034a97..d3773071f9 100644
--- a/dev-python/pip/pip-8.0.2-r1.ebuild
+++ b/dev-python/pip/pip-8.0.2-r1.ebuild
@@ -32,6 +32,7 @@ VENDOR_DEPEND="
>=dev-python/pyparsing-2.0.7[${PYTHON_USEDEP}]
virtual/python-ipaddress[${PYTHON_USEDEP}]
"
+# https://github.com/pypa/pip/issues/3057
RDEPEND="${VENDOR_DEPEND}
>=dev-python/setuptools-19.2[${PYTHON_USEDEP}]
<dev-python/setuptools-19.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
index 545cd1d65f..d5eb94af35 100644
--- a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild b/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild
index 57938f9332..e84a53c8d1 100644
--- a/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild
@@ -32,6 +32,6 @@ DEPEND="${RDEPEND}
RESTRICT="test"
python_test() {
- export PYTHONPATH="${S}:${PYTHONPATH}"
+ export PYTHONPATH="${S}:${PYTHONPATH}"
py.test -v -v -x || die ${PYTHONPATH}
}
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 8f2eacdbad..b5e94025c2 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -5,3 +5,4 @@ DIST rpy2-2.7.4.tar.gz 177030 SHA256 478f40c6775cc04188818d0410cd8340d900bd782ab
DIST rpy2-2.7.5.tar.gz 177407 SHA256 0d88f7fff21fbef523c8678ed8f850a36052edca4ce702c62f234fdcb52de441 SHA512 132618c42688302145f3df17b2153a40e57a9e3ada0b98c97091349794fcf79c03738dadcde5f3553bb915f6bec5a91812484e7886ce9d61033daab0ad5e62d8 WHIRLPOOL e8f8104add0b2e3ba1f5b0423c39e10c912252b9ba5f47b1fd572f3b3533a224fc689dc247a1c78c7ad2899983e5f494c5477c40f704fbbcb268d75d956275c7
DIST rpy2-2.7.6.tar.gz 177562 SHA256 ea35a2f37fd36e8af069731bf1421fbb2d3f8550bcb55fde3bebf0bcb1b00a5a SHA512 03c1f62aa367049815504ecea8bb3ff82dee779167ab59eea148e8d631e50151d4ce1805327ddf3b06821a767aab162c613a32d73e814a832d79158b455aab9c WHIRLPOOL 2df3db91e8a8132dbf25703fbb60aa7f17eb63faa56101c5e1697e9a37a21b7545629382643ac5d9420a9953c4d41ef2dc196dd50547d4d1119ec08fb5e0262e
DIST rpy2-2.7.7.tar.gz 178098 SHA256 bf17d49c83f856a9ca537a7746c5e5edced23c3a181b89b61cb959a5db90339f SHA512 66bb901150d256a2373aa52a4d05bd5cb93acf58e3f21cd55bf5d0f8f204953898b6dc5ebffa26e06b9ab76982a1cc31f0011b8520a059b071033f54e0b8836b WHIRLPOOL 1621345954c54b7250a93ec8fb1ca1ce110d6d9e4391ca023436eef1a70c69b4cdee0a8b01982706e4b6daba5f0fc74770b0ac4517642fb6c4d4ed148ef4eb97
+DIST rpy2-2.7.8.tar.gz 178334 SHA256 4f51bcdddea01a63e624f4b38de4f6b10a2466d82fd7e890791a07b06e51781d SHA512 adbc83c8003963219038b541e0b5d1736eb515fda77e277462e87cd1dfdc39b225bb73a659f62dc7fb1d7678a415047153fa4861328dc0ecf8ba450b3748150e WHIRLPOOL 4c1ffcbd88875223d80f1b078dbf1d8c59b85765b8b106a577d00f0d219560dbba6f5d2b7b66ac59434791781c0b1665c5bbee19f402fa4e1a0fdaa6b4db3852
diff --git a/dev-python/rpy/rpy-2.7.8.ebuild b/dev-python/rpy/rpy-2.7.8.ebuild
new file mode 100644
index 0000000000..6c31dd1bfe
--- /dev/null
+++ b/dev-python/rpy/rpy-2.7.8.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ >=dev-lang/R-3.1
+ dev-python/numpy[${PYTHON_USEDEP}]
+ >=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+# ggplot2 is an optional test dep but not in portage
+S="${WORKDIR}/${MY_P}"
+
+# Tarball absent of doc files in doc folder
+# https://bitbucket.org/rpy2/rpy2/issues/229
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS=${CFLAGS}
+ append-cflags -fno-strict-aliasing
+ fi
+ distutils-r1_python_compile
+}
+
+python_test() {
+ cd "${BUILD_DIR}"/lib || die
+ ${PYTHON} -m 'rpy2.tests' || die
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c8a8003aed..7622db787a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -11,3 +11,4 @@ DIST setuptools-19.4.tar.gz 641797 SHA256 214bf29933f47cf25e6faa569f710731728a07
DIST setuptools-19.6.1.tar.gz 637780 SHA256 d7fd89a4bbd89ea51aaf18100b50411cc881866f3456f11a8732f1c957f3d7da SHA512 542c41aafdeca3e7658650dfb1c2f5209eb89ae17586cddf1a57316b987507c1263648c93d4177d8d1f775c0ce60c0849b9f4639e395b364ddfe4d92f019be0c WHIRLPOOL 597ed23c4fed9e61f3e8dadfe405fc0cb6be8ccc34c38b3933f69da08452ac53c2ce9e743555544209dd7e55a57fd327bcd7060eb6d0367f869288945dda1a96
DIST setuptools-19.6.2.tar.gz 641373 SHA256 69261eefdb21057cfbe92ba8032b923d6363d6682967d42cf46388090d0f1a15 SHA512 c00ef832fd4d1514e440c36d90691e48aa179b14d24021dd7a0149dbb0ae8efb801327025a7e1911a29cef63eec7c5cbadfa78c832beb316b8a4391b4ff053fe WHIRLPOOL 3cbc2a1c29050a86a323a0271f4e17adda0df2f99620e54fdaf9038ca9f4e1bb0801fdd309be274c655aaf6fb7c6c77b4babb5cd721c09d9e6904235077b3736
DIST setuptools-19.6.tar.gz 641502 SHA256 ecd48d753c1a8ecc6a2826b863a6defaafbfd4ceafc0c1d62e5362f5a86912e9 SHA512 79b9a0f595bda16f18997d9937c6bc2e21bb2bb23fcca4be29df2fb71649c5ba973428472e3c795f2a5d6fbcccf1d5f29096a0fb593a4c52fa87b1d003e474da WHIRLPOOL 391f3e20739c717cc42613e099b867ee01cd8a1f3623f31062dee23131c3b1bad2e34345348f76e44ff2b92652cf65931b3fd8b6a7663b9c135a7c03b6954405
+DIST setuptools-19.7.tar.gz 641634 SHA256 9e0783f3e6b736530a84980dce99fb0f01dafcd31b3f600cde2aa446f6f77cc0 SHA512 fe74b10eb1afef5d78cc5cd4d6dbd53ed16f975c693c138181dfb1661276255d214037eb036186d0cdc9dd31d636f9f1067d67bf591542e8ef933afca267ee4c WHIRLPOOL e1ee325d3de9a6b0dfd49fc68129271faeaccf5ffb77a750f553986fc47b75a5003c17a3f00d76be15eb3808d04e7060f5ccddb9ca9c804fbb68ad54c01453f4
diff --git a/dev-python/setuptools/setuptools-19.7.ebuild b/dev-python/setuptools/setuptools-19.7.ebuild
new file mode 100644
index 0000000000..300425331f
--- /dev/null
+++ b/dev-python/setuptools/setuptools-19.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+ rm -r ./pkg_resources/_vendor || die
+ # disable tests requiring a network connection
+ rm setuptools/tests/test_packageindex.py || die
+
+ # don't run integration tests
+ rm setuptools/tests/test_integration.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+ export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+ distutils-r1_python_install
+}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index fa1cddcab4..54b8c86972 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -2,3 +2,4 @@ DIST testtools-0.9.36.tar.gz 201717 SHA256 20a1b0d6325f1303ff8112a272047057b7321
DIST testtools-1.8.0.tar.gz 207976 SHA256 8afd6400fb4e75adb0b29bd09695ecb2024cd7befab4677a58c147701afadd97 SHA512 b5f0201222d1e8c60fb7c2793bcd38e1c96c6f9fae99e9f3e784d17230c9abbf7325053d501c07e752bad2da36b49e2c79a25d0c20cb9a2f426057f839a77b3a WHIRLPOOL 71d4082197a9c179862fc3c63eadc37d6ff776f0a62e5fb08c296a5bf7109dc5110a2104a1ed15ca97c523aa0afb9e7124805ec6a6ae18f7605d7641abd9c54a
DIST testtools-1.8.1.tar.gz 209327 SHA256 155ed29086e48156519e15f7801b702c15ba34d8700d80ba606101f448a3839f SHA512 0bd765bd3cc82a38c980d251427f9f32d44c377aa753d2d83c36fb8cfaeb8a10cfc86a38899b89ff454fe11742ab5e309439980e12a8bbae19b3d9df799803d9 WHIRLPOOL 06f654e447b6ae42cffbff454886dc1016746bf218c90e89c4b9361af2dc709acdfdcd0100c1624dffc1f72dec5c8037dd4357aa373a6413abf945c0d27868e1
DIST testtools-1.9.0.tar.gz 221760 SHA256 b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644 SHA512 d4d78fb3fd105789e1ee749c66f4612494557af963ba7c3bf5b3c322609bb2ce98c6027f714cbf71720fe248d72a459b554aa65374c6a0b56904b7dabb38a112 WHIRLPOOL 926e738afd86fe945765f9fa08fa40deed7e73db4f37eb2fca9fa30321e28cda9c99e86a1e583853fe1abf93919a71c808131d2cd0694cded3d7203a406fc8d9
+DIST testtools-2.0.0.tar.gz 224923 SHA256 8237ab211cdeced2ff69e7b51c66ed8b1fd2aa0b338b1749609f9567646fad57 SHA512 e27659bc1a21f20de7b8f3699198067e25024dfed68fc9553045a1356a8b46df494882b8946212e11c9cb5a1d4ce8882758839a4accf5bd01db4398ff9e0413d WHIRLPOOL db4daec29b6e1fbe4b9c6989af7f0c70dc70a0d39f84336a9885d1e977cbe0303bf5471342a1d74e0e6a7eb961945d6180153711229dc18e8fdbb9f92b4d6df8
diff --git a/dev-python/testtools/testtools-2.0.0.ebuild b/dev-python/testtools/testtools-2.0.0.ebuild
new file mode 100644
index 0000000000..367c8a723d
--- /dev/null
+++ b/dev-python/testtools/testtools-2.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+ dev-python/extras[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+ dev-python/mimeparse[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+ dev-python/pyrsistent[${PYTHON_USEDEP}]
+ >=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+ dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/testscenarios[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ "${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 41b7d8ab8d..eb5e9e1751 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1 +1,2 @@
DIST Theano-0.6.0.tar.gz 1763756 SHA256 aaa75f9a9b7bf50f09ddcc01fb993cf47513179d0a7bee3d96bfeebd66e76083 SHA512 6333c673df809bed3af952e0759cce4878ed21684367c6eb20e422363c7c5696ea59239ff6a448c6a32771b1069d441b0e3d049f9708ae69d790412303b8ebbd WHIRLPOOL 946fcacb87b7745e72282f5f7e6b67db5fd0e365f55b2c97a8e9e506e30986d90da7c3789636892ca316da33f4f064f99d31fc3771678457dd609fd0c43d9010
+DIST Theano-0.7.0.tar.gz 1985387 SHA256 05b0f6d2467735abea13bdc5c2c1ce3c53f1b89f9ebc5a43abdf71f88cf818b3 SHA512 6e6bf9afdebf3c281d71f5ceda73792e0a52b403b18776a639665767ac73ac4920b5042e29d656d517b8f023e5f9cd5a27086e0456dc40c42abf6f3569da3f06 WHIRLPOOL b79906e39eb8f7cad26160148465b4719d1011e1a4626c98fdb55cd273ff289b0c01278d51fdc8271b71434be0fd036f8259a315b07639e9ad83d1e3bf313687
diff --git a/dev-python/theano/theano-0.6.0.ebuild b/dev-python/theano/theano-0.6.0.ebuild
index 148376601c..09384e6b81 100644
--- a/dev-python/theano/theano-0.6.0.ebuild
+++ b/dev-python/theano/theano-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,15 +11,14 @@ inherit distutils-r1 versionator
MYPN=Theano
MYP=${MYPN}-$(replace_version_separator 3 '')
-DESCRIPTION="Python library to define and optimize multi-dimensional arrays mathematical expressions"
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
HOMEPAGE="https://github.com/Theano/Theano"
-LICENSE="BSD"
-
SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
+LICENSE="BSD"
IUSE="test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
@@ -29,5 +28,5 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MYP}"
python_test() {
- nosetests || die
+ nosetests --verbosity=3 || die
}
diff --git a/dev-python/theano/theano-0.7.0.ebuild b/dev-python/theano/theano-0.7.0.ebuild
new file mode 100644
index 0000000000..46e5945771
--- /dev/null
+++ b/dev-python/theano/theano-0.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MYPN=Theano
+MYP=${MYPN}-$(replace_version_separator 3 '')
+
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
+HOMEPAGE="https://github.com/Theano/Theano"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=sci-libs/scipy-0.11[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MYP}"
+
+python_prepare_all() {
+ find -type f -name "*.py" -exec \
+ sed \
+ -e 's:theano.compat.six:six:g' \
+ -i '{}' + || die
+
+ rm ${PN}/compat/six.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests --verbosity=3 || die
+}