1 |
alunduil 14/09/27 19:20:47 |
2 |
|
3 |
Modified: ChangeLog oslotest-1.1.0.ebuild |
4 |
Log: |
5 |
update test runner to testr from nosetests |
6 |
|
7 |
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 92FEA28B) |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 dev-python/oslotest/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/oslotest/ChangeLog?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/oslotest/ChangeLog?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/oslotest/ChangeLog?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/oslotest/ChangeLog,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- ChangeLog 27 Sep 2014 08:40:28 -0000 1.4 |
23 |
+++ ChangeLog 27 Sep 2014 19:20:47 -0000 1.5 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for dev-python/oslotest |
26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/ChangeLog,v 1.4 2014/09/27 08:40:28 idella4 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/ChangeLog,v 1.5 2014/09/27 19:20:47 alunduil Exp $ |
29 |
+ |
30 |
+ 27 Sep 2014; Alex Brandt <alunduil@g.o> oslotest-1.1.0.ebuild: |
31 |
+ update test runner to testr from nosetests |
32 |
|
33 |
27 Sep 2014; Ian Delaney <idella4@g.o> oslotest-1.1.0.ebuild: |
34 |
fix to doc install |
35 |
|
36 |
|
37 |
|
38 |
1.5 dev-python/oslotest/oslotest-1.1.0.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/oslotest/oslotest-1.1.0.ebuild?rev=1.5&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/oslotest/oslotest-1.1.0.ebuild?rev=1.5&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/oslotest/oslotest-1.1.0.ebuild?r1=1.4&r2=1.5 |
43 |
|
44 |
Index: oslotest-1.1.0.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/oslotest/oslotest-1.1.0.ebuild,v |
47 |
retrieving revision 1.4 |
48 |
retrieving revision 1.5 |
49 |
diff -u -r1.4 -r1.5 |
50 |
--- oslotest-1.1.0.ebuild 27 Sep 2014 08:55:34 -0000 1.4 |
51 |
+++ oslotest-1.1.0.ebuild 27 Sep 2014 19:20:47 -0000 1.5 |
52 |
@@ -1,59 +1,66 @@ |
53 |
# Copyright 1999-2014 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/oslotest-1.1.0.ebuild,v 1.4 2014/09/27 08:55:34 idella4 Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/oslotest-1.1.0.ebuild,v 1.5 2014/09/27 19:20:47 alunduil Exp $ |
57 |
|
58 |
EAPI=5 |
59 |
-PYTHON_COMPAT=( python{2_7,3_3} ) |
60 |
+PYTHON_COMPAT=( python2_7 python3_3 ) |
61 |
|
62 |
inherit distutils-r1 |
63 |
|
64 |
-DESCRIPTION="OpenStack test framework and test fixtures" |
65 |
-HOMEPAGE="https://pypi.python.org/pypi/oslotest" |
66 |
+DESCRIPTION="OpenStack test framework" |
67 |
+HOMEPAGE="http://launchpad.net/oslo" |
68 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
69 |
|
70 |
LICENSE="Apache-2.0" |
71 |
SLOT="0" |
72 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
73 |
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux" |
74 |
IUSE="doc test" |
75 |
|
76 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
77 |
- >=dev-python/pbr-0.5.21[${PYTHON_USEDEP}] |
78 |
- <dev-python/pbr-1.0[${PYTHON_USEDEP}] |
79 |
- test? ( |
80 |
- >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}] |
81 |
- <dev-python/hacking-0.10[${PYTHON_USEDEP}] |
82 |
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}] |
83 |
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] |
84 |
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] |
85 |
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}] |
86 |
- >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] |
87 |
- )" |
88 |
-RDEPEND=">=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] |
89 |
- >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] |
90 |
- >=dev-python/six-1.7.0[${PYTHON_USEDEP}] |
91 |
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] |
92 |
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] |
93 |
- >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] |
94 |
- >=dev-python/mock-1.0[${PYTHON_USEDEP}] |
95 |
- >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]" |
96 |
+DEPEND=" |
97 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
98 |
+ >=dev-python/pbr-0.5.21[${PYTHON_USEDEP}] |
99 |
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}] |
100 |
+ test? ( |
101 |
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}] |
102 |
+ <dev-python/hacking-0.10[${PYTHON_USEDEP}] |
103 |
+ >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}] |
104 |
+ ) |
105 |
+ doc? ( |
106 |
+ >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] |
107 |
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] |
108 |
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] |
109 |
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}] |
110 |
+ ) |
111 |
+" |
112 |
+RDEPEND=" |
113 |
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] |
114 |
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}] |
115 |
+ >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}] |
116 |
+ >=dev-python/six-1.7.0[${PYTHON_USEDEP}] |
117 |
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] |
118 |
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] |
119 |
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] |
120 |
+ >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] |
121 |
+" |
122 |
|
123 |
python_compile_all() { |
124 |
use doc && esetup.py build_sphinx |
125 |
} |
126 |
|
127 |
python_test() { |
128 |
- nosetests tests/ || die "test failed under ${EPYTHON}" |
129 |
+ rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}" |
130 |
+ |
131 |
+ testr init || die "testr init failed under ${EPYTHON}" |
132 |
+ testr run || die "testr run failed under ${EPYTHON}" |
133 |
} |
134 |
|
135 |
python_install_all() { |
136 |
- if use doc; then |
137 |
- local HTML_DOCS=( doc/build/html/. ) |
138 |
- doman doc/build/man/oslotest.1 |
139 |
- fi |
140 |
+ use doc && local HTML_DOCS=( doc/build/html/. ) |
141 |
+ use doc && doman doc/build/man/oslotest.1 |
142 |
|
143 |
distutils-r1_python_install_all |
144 |
} |
145 |
|
146 |
pkg_postinst() { |
147 |
- elog; elog "to acquire the man page, re-emerge with USE=doc" |
148 |
+ elog "man page installation requires USE=doc" |
149 |
} |