Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/pytest: pytest-2.3.2-r1.ebuild pytest-2.3.3.ebuild ChangeLog pytest-2.3.2.ebuild
Date: Fri, 23 Nov 2012 01:20:11
Message-Id: 20121123011957.94E5F20C65@flycatcher.gentoo.org
1 floppym 12/11/23 01:19:57
2
3 Modified: pytest-2.3.2-r1.ebuild pytest-2.3.3.ebuild
4 ChangeLog
5 Removed: pytest-2.3.2.ebuild
6 Log:
7 Update dependency on dev-python/py and add a safety check. Thanks to Arfrever for pointing out the problem.
8
9 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
10
11 Revision Changes Path
12 1.2 dev-python/pytest/pytest-2.3.2-r1.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pytest/pytest-2.3.2-r1.ebuild?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pytest/pytest-2.3.2-r1.ebuild?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pytest/pytest-2.3.2-r1.ebuild?r1=1.1&r2=1.2
17
18 Index: pytest-2.3.2-r1.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.2-r1.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- pytest-2.3.2-r1.ebuild 6 Nov 2012 09:26:13 -0000 1.1
25 +++ pytest-2.3.2-r1.ebuild 23 Nov 2012 01:19:57 -0000 1.2
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.2-r1.ebuild,v 1.1 2012/11/06 09:26:13 idella4 Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.2-r1.ebuild,v 1.2 2012/11/23 01:19:57 floppym Exp $
31
32 EAPI="3"
33 SUPPORT_PYTHON_ABIS="1"
34 @@ -16,7 +16,9 @@
35 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
36 IUSE="doc"
37
38 -RDEPEND=">=dev-python/py-1.4.7"
39 +# When bumping, please check setup.py for the proper py version
40 +PY_VER="1.4.11"
41 +RDEPEND=">=dev-python/py-${PY_VER}"
42 DEPEND="${RDEPEND}
43 app-arch/unzip
44 dev-python/setuptools"
45 @@ -25,10 +27,10 @@
46 PYTHON_MODNAME="pytest.py _pytest"
47
48 src_prepare() {
49 - distutils_src_prepare
50 -
51 # Disable versioning of py.test script to avoid collision with versioning performed by distutils_src_install().
52 sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
53 + grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
54 + distutils_src_prepare
55 }
56
57 src_compile() {
58
59
60
61 1.2 dev-python/pytest/pytest-2.3.3.ebuild
62
63 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pytest/pytest-2.3.3.ebuild?rev=1.2&view=markup
64 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pytest/pytest-2.3.3.ebuild?rev=1.2&content-type=text/plain
65 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pytest/pytest-2.3.3.ebuild?r1=1.1&r2=1.2
66
67 Index: pytest-2.3.3.ebuild
68 ===================================================================
69 RCS file: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.3.ebuild,v
70 retrieving revision 1.1
71 retrieving revision 1.2
72 diff -u -r1.1 -r1.2
73 --- pytest-2.3.3.ebuild 11 Nov 2012 11:05:05 -0000 1.1
74 +++ pytest-2.3.3.ebuild 23 Nov 2012 01:19:57 -0000 1.2
75 @@ -1,6 +1,6 @@
76 # Copyright 1999-2012 Gentoo Foundation
77 # Distributed under the terms of the GNU General Public License v2
78 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.3.ebuild,v 1.1 2012/11/11 11:05:05 radhermit Exp $
79 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.3.ebuild,v 1.2 2012/11/23 01:19:57 floppym Exp $
80
81 EAPI="4"
82 SUPPORT_PYTHON_ABIS="1"
83 @@ -16,7 +16,9 @@
84 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
85 IUSE="doc"
86
87 -RDEPEND=">=dev-python/py-1.4.7"
88 +# When bumping, please check setup.py for the proper py version
89 +PY_VER="1.4.12"
90 +RDEPEND=">=dev-python/py-${PY_VER}"
91 DEPEND="${RDEPEND}
92 app-arch/unzip
93 dev-python/setuptools"
94 @@ -25,10 +27,10 @@
95 PYTHON_MODNAME="pytest.py _pytest"
96
97 src_prepare() {
98 - distutils_src_prepare
99 -
100 # Disable versioning of py.test script to avoid collision with versioning performed by distutils_src_install().
101 sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
102 + grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
103 + distutils_src_prepare
104 }
105
106 src_compile() {
107
108
109
110 1.41 dev-python/pytest/ChangeLog
111
112 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pytest/ChangeLog?rev=1.41&view=markup
113 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pytest/ChangeLog?rev=1.41&content-type=text/plain
114 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pytest/ChangeLog?r1=1.40&r2=1.41
115
116 Index: ChangeLog
117 ===================================================================
118 RCS file: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v
119 retrieving revision 1.40
120 retrieving revision 1.41
121 diff -u -r1.40 -r1.41
122 --- ChangeLog 11 Nov 2012 11:05:05 -0000 1.40
123 +++ ChangeLog 23 Nov 2012 01:19:57 -0000 1.41
124 @@ -1,6 +1,11 @@
125 # ChangeLog for dev-python/pytest
126 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
127 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.40 2012/11/11 11:05:05 radhermit Exp $
128 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.41 2012/11/23 01:19:57 floppym Exp $
129 +
130 + 23 Nov 2012; Mike Gilbert <floppym@g.o> -pytest-2.3.2.ebuild,
131 + pytest-2.3.2-r1.ebuild, pytest-2.3.3.ebuild:
132 + Update dependency on dev-python/py and add a safety check. Thanks to Arfrever
133 + for pointing out the problem.
134
135 *pytest-2.3.3 (11 Nov 2012)
Report Message
Find on MARC Find on Google Groups