pythonPackages.scrapy: 1.6.0 -> 1.7.1

This commit is contained in:
Mario Rodas 2019-07-18 19:57:42 -05:00 committed by Frederik Rietdijk
parent 75a3bf5e5d
commit 80d39388de

View File

@ -1,8 +1,8 @@
{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore, { stdenv, buildPythonPackage, fetchPypi, fetchpatch, glibcLocales, mock, pytest, botocore,
testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
service-identity, parsel, pydispatcher, cssselect, lib }: service-identity, parsel, pydispatcher, cssselect, lib }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.6.0"; version = "1.7.1";
pname = "Scrapy"; pname = "Scrapy";
checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
@ -16,6 +16,12 @@ buildPythonPackage rec {
# root and readonly. As a consequence scrapy can't edit the # root and readonly. As a consequence scrapy can't edit the
# project templates. # project templates.
./permissions-fix.patch ./permissions-fix.patch
# Fix configparser import for python2. See: https://github.com/scrapy/scrapy/pull/3887
(fetchpatch {
url = "https://github.com/scrapy/scrapy/commit/21345dc9ec60dcc1cd2e5c0eace5788aa502ce23.patch";
sha256 = "09834rcjyggvyj6zignvfga2xbqkknygly5p4a96k2mvz0xn3v6z";
})
]; ];
LC_ALL="en_US.UTF-8"; LC_ALL="en_US.UTF-8";
@ -25,12 +31,13 @@ buildPythonPackage rec {
# Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean" # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean"
# Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396 # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396
checkPhase = '' checkPhase = ''
pytest -p no:doctest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"} substituteInPlace pytest.ini --replace "addopts = --doctest-modules" "addopts ="
pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"}
''; '';
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "558dfd10ac53cb324ecd7eefd3eac412161c7507c082b01b0bcd2c6e2e9f0766"; sha256 = "da8987d199092c3bb33d4d1d021507cd933aa67f5177e2d36f31343e8a6bd7f1";
}; };
postInstall = '' postInstall = ''