Merge pull request #18745 from berdario/scrapy-py3
Upgrade to latest Scrapy with Python3 support. Upgrade/add dependencies:
This commit is contained in:
commit
e25cbdd9d2
@ -17041,6 +17041,29 @@ in modules // {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
parsel = buildPythonPackage rec {
|
||||||
|
name = "parsel-${version}";
|
||||||
|
version = "1.0.3";
|
||||||
|
|
||||||
|
src = pkgs.fetchurl {
|
||||||
|
url = "mirror://pypi/p/parsel/${name}.tar.gz";
|
||||||
|
sha256 = "9c12c370feda864c2f541cecce9bfb3a2a682c6c59c097a852e7b040dc6b8431";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = with self; [ pytest ];
|
||||||
|
propagatedBuildInputs = with self; [ six w3lib lxml cssselect ];
|
||||||
|
|
||||||
|
checkPhase = ''
|
||||||
|
py.test
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "https://github.com/scrapy/parsel";
|
||||||
|
description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors";
|
||||||
|
license = licenses.bsd3;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
partd = buildPythonPackage rec {
|
partd = buildPythonPackage rec {
|
||||||
name = "partd-${version}";
|
name = "partd-${version}";
|
||||||
version = "0.3.3";
|
version = "0.3.3";
|
||||||
@ -18752,13 +18775,18 @@ in modules // {
|
|||||||
|
|
||||||
pydispatcher = buildPythonPackage (rec {
|
pydispatcher = buildPythonPackage (rec {
|
||||||
version = "2.0.5";
|
version = "2.0.5";
|
||||||
disabled = isPy35;
|
|
||||||
name = "pydispatcher-${version}";
|
name = "pydispatcher-${version}";
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "mirror://pypi/P/PyDispatcher/PyDispatcher-${version}.tar.gz";
|
url = "mirror://pypi/P/PyDispatcher/PyDispatcher-${version}.tar.gz";
|
||||||
sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m";
|
sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
buildInputs = with self; [ pytest ];
|
||||||
|
|
||||||
|
checkPhase = ''
|
||||||
|
py.test
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://pydispatcher.sourceforge.net/;
|
homepage = http://pydispatcher.sourceforge.net/;
|
||||||
description = "Signal-registration and routing infrastructure for use in multiple contexts";
|
description = "Signal-registration and routing infrastructure for use in multiple contexts";
|
||||||
@ -24401,10 +24429,10 @@ in modules // {
|
|||||||
twisted = buildPythonPackage rec {
|
twisted = buildPythonPackage rec {
|
||||||
|
|
||||||
name = "Twisted-${version}";
|
name = "Twisted-${version}";
|
||||||
version = "16.4.0";
|
version = "16.4.1";
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
|
url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
|
||||||
sha256 = "cd8820901900542d21fb1dee2cd4d4d334fff130e3fc30b777f81dd7d7f2836e";
|
sha256 = "1d8d73f006c990744effb35588359fd44d43608649ac0b6b7edc71176e88e816";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with self; [ zope_interface ];
|
propagatedBuildInputs = with self; [ zope_interface ];
|
||||||
@ -29128,16 +29156,21 @@ in modules // {
|
|||||||
|
|
||||||
scrapy = buildPythonPackage rec {
|
scrapy = buildPythonPackage rec {
|
||||||
name = "Scrapy-${version}";
|
name = "Scrapy-${version}";
|
||||||
version = "1.0.5";
|
version = "1.1.2";
|
||||||
|
|
||||||
disabled = isPy3k;
|
buildInputs = with self; [ pytest botocore testfixtures pillow ];
|
||||||
|
propagatedBuildInputs = with self; [
|
||||||
|
six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = with self ; [ pytest ];
|
checkPhase = ''
|
||||||
propagatedBuildInputs = with self ; [ six twisted w3lib lxml cssselect queuelib pyopenssl service-identity ];
|
env LC_ALL=en_US.UTF-8 py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
|
||||||
|
# The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
|
||||||
|
'';
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
|
url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
|
||||||
sha256 = "0a51c785a310d65f6e70285a2da56d48ef7d049bd7fd60a08eef05c52328ca96";
|
sha256 = "a0a8c7bccbd598d2731ec9f267b8efbd8fb99767f826f8f2924a5610707a03d4";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user