1 |
commit: a34b4f77e0567f61197feba15f52a132a1064cf0 |
2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 31 15:40:19 2015 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 31 15:40:19 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34b4f77 |
7 |
|
8 |
dev-python/scrapy: bump; update and tidy deps |
9 |
|
10 |
update test phase to run full testsuite, disable failing tests while |
11 |
upstream makes a fix, remove old |
12 |
|
13 |
Package-Manager: portage-2.2.20 |
14 |
|
15 |
dev-python/scrapy/Manifest | 3 +- |
16 |
dev-python/scrapy/scrapy-0.25.1.ebuild | 65 ---------------------- |
17 |
.../{scrapy-1.0.0.ebuild => scrapy-1.0.3.ebuild} | 39 +++++++++---- |
18 |
3 files changed, 28 insertions(+), 79 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest |
21 |
index 1856c80..ca5d0ae 100644 |
22 |
--- a/dev-python/scrapy/Manifest |
23 |
+++ b/dev-python/scrapy/Manifest |
24 |
@@ -1,3 +1,2 @@ |
25 |
-DIST scrapy-0.25.1.tar.gz 986555 SHA256 11e6496b7196239f395c977c432667466cdef6984dff164337bca7aa37049ed5 SHA512 7c1afbf942c06ab6a849fe609ad8d582de5d42041181bb22b2388bfe13ce23438c3c6ce936953f819e4b897aadbf682cc04f8cd0805f44157b10a583c668f924 WHIRLPOOL 692f0e11065d9b149d7bdcdd9414d718f05986767a5cd3632ad3f5db23904b42a5af5609468f2bc321f827d6e3352eb0ce36cb797d68228c608ae8fa57f940c4 |
26 |
-DIST scrapy-1.0.0.tar.gz 1006570 SHA256 3ae419f876902e376abe6de207f91ea383ce1e385d21784965a90617985fb1d6 SHA512 72bd686da3e4d789ca51b5f90f726ece678f64dcbfe7f25cd2c377536ece9ec8c9cf49fc018ef383a910f190a32e46e7894fd165d34e191249f7bd9ae018499f WHIRLPOOL f9b26256c0d0b0ba4d088538b3f6d967eb6f0294312da61adc2d2a790bc4851555f019b1e139f7c3a83b4922065593a41606f155d9b953ded2124e551af2d194 |
27 |
DIST scrapy-1.0.1.tar.gz 1006619 SHA256 713ffd19616057d10addea2cba92cb6eee1642f59c803942b029cd02baa1be37 SHA512 99a6c99816c94c936c87c3f282bcc3866786b4d1adc57e00c8812c3761ef05279f0ded6746d3fdc947496549d22090f59a22392b207d56b24ca537b0e1e30372 WHIRLPOOL 3e3aef1d5416c009903a6a37df5e3f33237a50555a6dd09bde4ed6fe303473f1ef44501a04754f3d1ab2fe61668c6f7f56d507a77d89060b6fca7054f05af65c |
28 |
+DIST scrapy-1.0.3.tar.gz 1006911 SHA256 725eb5906b35076ad112b1b0ac27c68dd684e72514eddf95bc7ace64c04b2bb2 SHA512 bf61d449d7309de0ebdc36c73371d01518ee5cfa5d4ac1b68ee42389466ee15dba82690dbc885aa6bc1b9fe0b2e29a03fb3a3af3889842e1039e3a81749fc0c0 WHIRLPOOL 0dee3a82a0368f50420d484252d5d138c8a3bf8257715dad5d74419a7a852ef5d21aef5b52e9959f8f08d7dcdd58988221faff38d9a8d530406cfb83fbb031f9 |
29 |
|
30 |
diff --git a/dev-python/scrapy/scrapy-0.25.1.ebuild b/dev-python/scrapy/scrapy-0.25.1.ebuild |
31 |
deleted file mode 100644 |
32 |
index eb5cd99..0000000 |
33 |
--- a/dev-python/scrapy/scrapy-0.25.1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,65 +0,0 @@ |
36 |
-# Copyright 1999-2015 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
-# $Id$ |
39 |
- |
40 |
-EAPI=5 |
41 |
- |
42 |
-PYTHON_COMPAT=( python2_7 ) |
43 |
-PYTHON_REQ_USE="sqlite(+)" |
44 |
- |
45 |
-inherit vcs-snapshot distutils-r1 |
46 |
- |
47 |
-DESCRIPTION="A high-level Python Screen Scraping framework" |
48 |
-HOMEPAGE="http://scrapy.org https://pypi.python.org/pypi/Scrapy/" |
49 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
50 |
- |
51 |
-LICENSE="BSD-2" |
52 |
-SLOT="0" |
53 |
-KEYWORDS="~amd64 ~x86" |
54 |
-IUSE="boto doc ibl test ssl" |
55 |
- |
56 |
-RDEPEND=">=dev-python/six-1.5.2[${PYTHON_USEDEP}] |
57 |
- dev-libs/libxml2[python,${PYTHON_USEDEP}] |
58 |
- virtual/python-imaging[${PYTHON_USEDEP}] |
59 |
- dev-python/lxml[${PYTHON_USEDEP}] |
60 |
- ibl? ( dev-python/numpy[${PYTHON_USEDEP}] ) |
61 |
- ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
62 |
- boto? ( dev-python/boto[${PYTHON_USEDEP}] ) |
63 |
- >=dev-python/twisted-core-10.0.0[${PYTHON_USEDEP}] |
64 |
- >=dev-python/twisted-conch-10.0.0[${PYTHON_USEDEP}] |
65 |
- >=dev-python/twisted-mail-10.0.0[${PYTHON_USEDEP}] |
66 |
- >=dev-python/twisted-web-10.0.0[${PYTHON_USEDEP}] |
67 |
- >=dev-python/w3lib-1.6[${PYTHON_USEDEP}] |
68 |
- dev-python/queuelib[${PYTHON_USEDEP}] |
69 |
- >=dev-python/cssselect-0.9[${PYTHON_USEDEP}]" |
70 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
71 |
- dev-python/six[${PYTHON_USEDEP}] |
72 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
73 |
- test? ( ${RDEPEND} |
74 |
- dev-python/boto[${PYTHON_USEDEP}] |
75 |
- dev-python/django[${PYTHON_USEDEP}] |
76 |
- dev-python/pillow[${PYTHON_USEDEP}] |
77 |
- dev-python/mock[${PYTHON_USEDEP}] |
78 |
- >=net-proxy/mitmproxy-0.10[${PYTHON_USEDEP}] |
79 |
- net-ftp/vsftpd )" |
80 |
-# pytest-twisted listed as a test dep but not in portage. |
81 |
-# Testsuite currently survives without it, so appears optional |
82 |
- |
83 |
-REQUIRED_USE="test? ( ssl boto )" |
84 |
- |
85 |
-PATCHES=( "${FILESDIR}"/${PV}-setup.patch ) |
86 |
- |
87 |
-python_compile_all() { |
88 |
- if use doc; then |
89 |
- PYTHONPATH="${S}" emake -C docs html || die "emake html failed" |
90 |
- fi |
91 |
-} |
92 |
- |
93 |
-python_test() { |
94 |
- py.test ${PN} || die "tests failed" |
95 |
-} |
96 |
- |
97 |
-python_install_all() { |
98 |
- use doc && local HTML_DOCS=( docs/build/html/. ) |
99 |
- distutils-r1_python_install_all |
100 |
-} |
101 |
|
102 |
diff --git a/dev-python/scrapy/scrapy-1.0.0.ebuild b/dev-python/scrapy/scrapy-1.0.3.ebuild |
103 |
similarity index 57% |
104 |
rename from dev-python/scrapy/scrapy-1.0.0.ebuild |
105 |
rename to dev-python/scrapy/scrapy-1.0.3.ebuild |
106 |
index 1f58a0d..21f1be0 100644 |
107 |
--- a/dev-python/scrapy/scrapy-1.0.0.ebuild |
108 |
+++ b/dev-python/scrapy/scrapy-1.0.3.ebuild |
109 |
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="sqlite(+)" |
110 |
inherit vcs-snapshot distutils-r1 |
111 |
|
112 |
DESCRIPTION="A high-level Python Screen Scraping framework" |
113 |
-HOMEPAGE="http://scrapy.org https://pypi.python.org/pypi/Scrapy/" |
114 |
+HOMEPAGE="https://github.com/scrapy/scrapy/ http://pypi.python.org/pypi/Scrapy/" |
115 |
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
116 |
|
117 |
LICENSE="BSD-2" |
118 |
@@ -18,28 +18,30 @@ SLOT="0" |
119 |
KEYWORDS="~amd64 ~x86" |
120 |
IUSE="boto doc ibl test ssl" |
121 |
|
122 |
-RDEPEND=">=dev-python/six-1.5.2[${PYTHON_USEDEP}] |
123 |
+RDEPEND=" |
124 |
+ >=dev-python/six-1.5.2[${PYTHON_USEDEP}] |
125 |
dev-libs/libxml2[python,${PYTHON_USEDEP}] |
126 |
virtual/python-imaging[${PYTHON_USEDEP}] |
127 |
dev-python/lxml[${PYTHON_USEDEP}] |
128 |
ibl? ( dev-python/numpy[${PYTHON_USEDEP}] ) |
129 |
ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
130 |
boto? ( dev-python/boto[${PYTHON_USEDEP}] ) |
131 |
- >=dev-python/twisted-core-10.0.0[${PYTHON_USEDEP}] |
132 |
- >=dev-python/twisted-conch-10.0.0[${PYTHON_USEDEP}] |
133 |
- >=dev-python/twisted-mail-10.0.0[${PYTHON_USEDEP}] |
134 |
- >=dev-python/twisted-web-10.0.0[${PYTHON_USEDEP}] |
135 |
+ dev-python/twisted-core[${PYTHON_USEDEP}] |
136 |
+ dev-python/twisted-conch[${PYTHON_USEDEP}] |
137 |
+ dev-python/twisted-mail[${PYTHON_USEDEP}] |
138 |
+ dev-python/twisted-web[${PYTHON_USEDEP}] |
139 |
>=dev-python/w3lib-1.8.0[${PYTHON_USEDEP}] |
140 |
dev-python/queuelib[${PYTHON_USEDEP}] |
141 |
- >=dev-python/cssselect-0.9[${PYTHON_USEDEP}]" |
142 |
+ >=dev-python/cssselect-0.9[${PYTHON_USEDEP}] |
143 |
+ >=dev-python/six-1.5.2[${PYTHON_USEDEP}] |
144 |
+ dev-python/service_identity[${PYTHON_USEDEP}] |
145 |
+ " |
146 |
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
147 |
- dev-python/six[${PYTHON_USEDEP}] |
148 |
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
149 |
test? ( ${RDEPEND} |
150 |
- dev-python/boto[${PYTHON_USEDEP}] |
151 |
dev-python/mock[${PYTHON_USEDEP}] |
152 |
- >=net-proxy/mitmproxy-0.10.1[${PYTHON_USEDEP}] |
153 |
- ~dev-python/netlib-0.10.1[${PYTHON_USEDEP}] |
154 |
+ =net-proxy/mitmproxy-0.10.1[${PYTHON_USEDEP}] |
155 |
+ =dev-python/netlib-0.10.1[${PYTHON_USEDEP}] |
156 |
dev-python/jmespath[${PYTHON_USEDEP}] |
157 |
dev-python/testfixtures[${PYTHON_USEDEP}] |
158 |
net-ftp/vsftpd )" |
159 |
@@ -48,6 +50,19 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
160 |
|
161 |
REQUIRED_USE="test? ( ssl boto )" |
162 |
|
163 |
+python_prepare_all() { |
164 |
+ # https://github.com/scrapy/scrapy/issues/1464 |
165 |
+ # Disable failing tests known to pass according to upstream |
166 |
+ # Awaiting a fix planned by package owner. |
167 |
+ sed -e 's:test_https_connect_tunnel:_&:' \ |
168 |
+ -e 's:test_https_connect_tunnel_error:_&:' \ |
169 |
+ -e 's:test_https_tunnel_auth_error:_&:' \ |
170 |
+ -e 's:test_https_tunnel_without_leak_proxy_authorization_header:_&:' \ |
171 |
+ -i tests/test_proxy_connect.py || die |
172 |
+ |
173 |
+ distutils-r1_python_prepare_all |
174 |
+} |
175 |
+ |
176 |
python_compile_all() { |
177 |
if use doc; then |
178 |
PYTHONPATH="${S}" emake -C docs html || die "emake html failed" |
179 |
@@ -55,7 +70,7 @@ python_compile_all() { |
180 |
} |
181 |
|
182 |
python_test() { |
183 |
- py.test ${PN} || die "tests failed" |
184 |
+ py.test ${PN} tests || die "tests failed" |
185 |
} |
186 |
|
187 |
python_install_all() { |