summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-02-05 20:23:30 +0800
committerGitHub <noreply@github.com>2023-02-05 20:23:30 +0800
commit1adf67530fdf68f4fef3fa024b609706adb50e84 (patch)
tree4e04a684ccdfa8b1931030fa901ae2f3f24e7b07
parent821f72ac3e343fadc3964c48b589643996193b6a (diff)
parenteec743c64af2586418df8e82aab2fc226a8718e2 (diff)
Merge pull request #214449 from marsam/update-scrapy
python310Packages.scrapy: 2.7.1 -> 2.8.0
-rw-r--r--pkgs/development/python-modules/scrapy-splash/default.nix4
-rw-r--r--pkgs/development/python-modules/scrapy/default.nix15
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix
index 9be77facf08e..290637cb8abb 100644
--- a/pkgs/development/python-modules/scrapy-splash/default.nix
+++ b/pkgs/development/python-modules/scrapy-splash/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "scrapy-splash";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a7c17735415151ae01f07b03c7624e7276a343779b3c5f4546f655f6133df42f";
+ sha256 = "sha256-7PEwJk3AjgxGHIYH7K13dGimStAd7bJinA+BvV/NcpU=";
};
propagatedBuildInputs = [ scrapy six ];
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 646db47538bb..62756a4eab2c 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "scrapy";
- version = "2.7.1";
+ version = "2.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "Scrapy";
- hash = "sha256-MPpAg1PSSx35ed8upK+9GbSuAvsiB/IY0kYzLx4c8U4=";
+ hash = "sha256-gHGsbGXxhewsdv6FCflNmf6ggFGf3CBvkIqSDV4F/kM=";
};
nativeBuildInputs = [
@@ -118,12 +118,18 @@ buildPythonPackage rec {
"test_xmliter_encoding"
"test_download"
"test_reactor_default_twisted_reactor_select"
+ "URIParamsSettingTest"
+ "URIParamsFeedOptionTest"
+ # flaky on darwin-aarch64
+ "test_fixed_delay"
+ "test_start_requests_laziness"
];
postInstall = ''
installManPage extras/scrapy.1
- install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy
- install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy
+ installShellCompletion --cmd scrapy \
+ --zsh extras/scrapy_zsh_completion \
+ --bash extras/scrapy_bash_completion
'';
pythonImportsCheck = [
@@ -143,6 +149,5 @@ buildPythonPackage rec {
changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ marsam ];
- platforms = platforms.unix;
};
}