From a618a1231dcd8a01c9af68a566496075b647f956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 Feb 2025 20:37:49 -0800 Subject: [PATCH 1/2] python313Packages.scrapy-splash: 0.9.0 -> 0.11.1 Diff: https://github.com/scrapy-plugins/scrapy-splash/compare/refs/tags/0.9.0...0.11.1 Changelog: https://github.com/scrapy-plugins/scrapy-splash/blob/0.11.1/CHANGES.rst --- .../python-modules/scrapy-splash/default.nix | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index f3de180ef948..a6491a8d3d17 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -1,34 +1,47 @@ { lib, - fetchPypi, buildPythonPackage, + fetchFromGitHub, + hypothesis, + pytest-twisted, + pytestCheckHook, scrapy, + setuptools, six, }: buildPythonPackage rec { pname = "scrapy-splash"; - version = "0.9.0"; - format = "setuptools"; + version = "0.11.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-7PEwJk3AjgxGHIYH7K13dGimStAd7bJinA+BvV/NcpU="; + src = fetchFromGitHub { + owner = "scrapy-plugins"; + repo = "scrapy-splash"; + tag = version; + hash = "sha256-eOWqSCuuZtUtaEuAew4g0P67N0zClaguHn2u4ZMT3FU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ scrapy six ]; - # no tests - doCheck = false; pythonImportsCheck = [ "scrapy_splash" ]; - meta = with lib; { + nativeCheckInputs = [ + hypothesis + pytest-twisted + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/scrapy-plugins/scrapy-splash/blob/${src.tag}/CHANGES.rst"; description = "Scrapy+Splash for JavaScript integration"; homepage = "https://github.com/scrapy-plugins/scrapy-splash"; - license = licenses.bsd3; - maintainers = with maintainers; [ evanjs ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ evanjs ]; }; } From 1121a35416de44ae22d7bec9fa2e50fa9d162da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 Feb 2025 20:41:07 -0800 Subject: [PATCH 2/2] python313Packages.scrapy-deltafetch: mark broken --- pkgs/development/python-modules/scrapy-deltafetch/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix index fa2c1ab63c40..88658dfa2d77 100644 --- a/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "scrapy_deltafetch" ]; meta = { + # https://github.com/scrapy-plugins/scrapy-deltafetch/pull/50 + broken = lib.versionAtLeast scrapy.version "2.12"; description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls"; homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch"; license = lib.licenses.bsd3;