From c46ca32d7d7d2c9898142a733fcbbd339e0191d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Jul 2024 21:02:30 +0200 Subject: [PATCH 1/5] python312Packages.w3lib: 2.1.2 -> 2.2.1 Changelog: https://github.com/scrapy/w3lib/blob/v2.2.1/NEWS --- pkgs/development/python-modules/w3lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 56db3c2434ed..cb0ca92e47bf 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "w3lib"; - version = "2.1.2"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7Vt06ZfuoqvjwTIfkW40QUTujpBypvM0Y+6OV/hYpLE="; + hash = "sha256-dW/y2Uxk5ByNfAxZ/qEqXQvFXjOlMceYi0oWPeubB90="; }; nativeCheckInputs = [ pytestCheckHook ]; From 8df2cb9200b091c3c9a32c43532dd8e6b9b25cfe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Jul 2024 21:04:41 +0200 Subject: [PATCH 2/5] python312Packages.playwrightcapture: 1.24.11 -> 1.25.0 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.24.11...v1.25.0 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.25.0 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index e8d6af86ca19..d25abcde51c6 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.24.11"; + version = "1.25.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-aDD+eovq6V7c69ORqekcfmDgTGJqvd2lYMIQ2+9TFYY="; + hash = "sha256-Sm6FfwUxW3t7gLwWd+ZJPyp0VSMPgGpuT3lrMurWOa0="; }; pythonRelaxDeps = [ From 83a28438b21cc3359255940aad734734cdd9e470 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Jul 2024 21:09:10 +0200 Subject: [PATCH 3/5] python311Packages.w3lib: refactor --- pkgs/development/python-modules/w3lib/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index cb0ca92e47bf..2fa0ee811737 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -3,14 +3,14 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonAtLeast, pythonOlder, + setuptools }: buildPythonPackage rec { pname = "w3lib"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,16 +19,12 @@ buildPythonPackage rec { hash = "sha256-dW/y2Uxk5ByNfAxZ/qEqXQvFXjOlMceYi0oWPeubB90="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "w3lib" ]; - disabledTests = lib.optionals (pythonAtLeast "3.11") [ - # regressed on Python 3.11.4 - # https://github.com/scrapy/w3lib/issues/212 - "test_safe_url_string_url" - ]; - meta = with lib; { description = "Library of web-related functions"; homepage = "https://github.com/scrapy/w3lib"; From 8575fbc2879eadaea900d4643221f1f6312b670a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Jul 2024 21:12:42 +0200 Subject: [PATCH 4/5] python311Packages.parsel: refactor - clean-up --- pkgs/development/python-modules/parsel/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 457456c678bf..1c0f6a521ad8 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -9,13 +9,14 @@ psutil, pytestCheckHook, pythonOlder, + setuptools, w3lib, }: buildPythonPackage rec { pname = "parsel"; version = "1.9.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,12 +25,9 @@ buildPythonPackage rec { hash = "sha256-FOANwHcxyQMNtiDBlfyuiEtbSEjp+cUjxhGfcIzPqaw="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cssselect jmespath lxml @@ -47,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to extract data from HTML and XML using XPath and CSS selectors"; homepage = "https://github.com/scrapy/parsel"; + changelog = "https://github.com/scrapy/parsel/blob/v${version}/NEWS"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; From 3200f9fb0f3bbbde3ca13b07099965d5cc8216e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Jul 2024 22:00:07 +0200 Subject: [PATCH 5/5] python312Packages.lacuscore: 1.9.6 -> 1.10.0 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.9.6...v1.10.0 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.10.0 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index cd18863618ad..2f5fbf4e6901 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.9.6"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-SCObCYcZ+aDzWOkE5tzkKMkgAP/h7HDNyHXMFmYjiHQ="; + hash = "sha256-hbMMKV/LJSfCgl293Tm4kkpwoYYpgydV/reri9ONj+4="; }; pythonRelaxDeps = [