| 1 |
idella4 14/05/05 15:16:07 |
| 2 |
|
| 3 |
Modified: encore-0.5.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
drop py2.6 add pypy support, cull IUSE flags according to content absent from the tarball, patch for some tests to pass under pypy, upgrade test phase to accommadate pypy |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/encore/encore-0.5.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: encore-0.5.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- encore-0.5.1.ebuild 3 May 2014 08:30:43 -0000 1.1 |
| 23 |
+++ encore-0.5.1.ebuild 5 May 2014 15:16:07 -0000 1.2 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild,v 1.1 2014/05/03 08:30:43 patrick Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild,v 1.2 2014/05/05 15:16:07 idella4 Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
| 33 |
+PYTHON_COMPAT=( python2_7 pypy ) |
| 34 |
|
| 35 |
inherit distutils-r1 |
| 36 |
|
| 37 |
@@ -15,38 +15,23 @@ |
| 38 |
LICENSE="BSD" |
| 39 |
SLOT="0" |
| 40 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 41 |
-IUSE="doc examples test" |
| 42 |
+IUSE="test" |
| 43 |
|
| 44 |
-RDEPEND="" |
| 45 |
-DEPEND="${RDEPEND} |
| 46 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 47 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
| 48 |
- test? ( |
| 49 |
+RDEPEND="virtual/python-futures[${PYTHON_USEDEP}] |
| 50 |
+ dev-python/requests[${PYTHON_USEDEP}]" |
| 51 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 52 |
+ test? ( ${RDEPEND} |
| 53 |
dev-python/nose[${PYTHON_USEDEP}] |
| 54 |
- virtual/python-futures[${PYTHON_USEDEP}] |
| 55 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 56 |
- dev-python/mock[${PYTHON_USEDEP}] |
| 57 |
- )" |
| 58 |
+ dev-python/mock[${PYTHON_USEDEP}] )" |
| 59 |
|
| 60 |
-python_compile_all() { |
| 61 |
- use doc && emake -C docs html |
| 62 |
-} |
| 63 |
+PATCHES=( "${FILESDIR}"/${P}-pypy-tests.patch ) |
| 64 |
|
| 65 |
python_test() { |
| 66 |
- if [[ ${EPYTHON} == python2.6 ]]; then |
| 67 |
- ewarn "Tests disabled for ${EPYTHON}" |
| 68 |
- return 0 |
| 69 |
- fi |
| 70 |
- nosetests || die |
| 71 |
-} |
| 72 |
- |
| 73 |
-python_install_all() { |
| 74 |
- distutils-r1_python_install_all |
| 75 |
- |
| 76 |
- use doc && dohtml -r docs/build/html/* |
| 77 |
- |
| 78 |
- if use examples; then |
| 79 |
- insinto /usr/share/doc/${PF} |
| 80 |
- doins -r examples |
| 81 |
+ "${PYTHON}" -m unittest discover ./${PN}/events || die |
| 82 |
+ # PYTHONPATH goes astray & '-m unittest discover' loses its way. nose works |
| 83 |
+ # https://github.com/enthought/encore/issues/84 |
| 84 |
+ # tests for storage simply aren't written to cater to pypy |
| 85 |
+ if [[ "${EPYTHON}" == python2.7 ]]; then |
| 86 |
+ nosetests ./${PN}/storage || die |
| 87 |
fi |
| 88 |
} |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.8 dev-python/encore/ChangeLog |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/ChangeLog?rev=1.8&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/ChangeLog?rev=1.8&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/ChangeLog?r1=1.7&r2=1.8 |
| 97 |
|
| 98 |
Index: ChangeLog |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/encore/ChangeLog,v |
| 101 |
retrieving revision 1.7 |
| 102 |
retrieving revision 1.8 |
| 103 |
diff -u -r1.7 -r1.8 |
| 104 |
--- ChangeLog 3 May 2014 08:30:43 -0000 1.7 |
| 105 |
+++ ChangeLog 5 May 2014 15:16:07 -0000 1.8 |
| 106 |
@@ -1,6 +1,12 @@ |
| 107 |
# ChangeLog for dev-python/encore |
| 108 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/ChangeLog,v 1.7 2014/05/03 08:30:43 patrick Exp $ |
| 110 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/ChangeLog,v 1.8 2014/05/05 15:16:07 idella4 Exp $ |
| 111 |
+ |
| 112 |
+ 05 May 2014; Ian Delaney <idella4@g.o> |
| 113 |
+ +files/encore-0.5.1-pypy-tests.patch, encore-0.5.1.ebuild: |
| 114 |
+ drop py2.6 add pypy support, cull IUSE flags according to content absent from |
| 115 |
+ the tarball, patch for some tests to pass under pypy, upgrade test phase to |
| 116 |
+ accommadate pypy |
| 117 |
|
| 118 |
*encore-0.5.1 (03 May 2014) |
Archives