From 0ca5fa5785981d89eca82d36bdf187754f53bec2 Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Tue, 2 Dec 2025 11:52:01 -0800 Subject: [PATCH 1/2] python3Packages.{pyppeteer-ng,price-parser,panzi-json-logic}: modernize Resolve suggestions after #445661 was merged. --- pkgs/development/python-modules/price-parser/default.nix | 8 +++++--- pkgs/development/python-modules/pyppeteer-ng/default.nix | 6 ++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/price-parser/default.nix b/pkgs/development/python-modules/price-parser/default.nix index c2baaced3afb..0eb2a7a68eaf 100644 --- a/pkgs/development/python-modules/price-parser/default.nix +++ b/pkgs/development/python-modules/price-parser/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, pytestCheckHook, setuptools, - pytest-cov, + pytest-cov-stub, attrs, }: buildPythonPackage rec { pname = "price-parser"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "scrapinghub"; @@ -20,11 +20,13 @@ buildPythonPackage rec { hash = "sha256-9f/+Yw94SVvg9fl9zYR9YEMwAgKHwySG5cysPMomnA0="; }; + build-system = [ setuptools ]; + dependencies = [ attrs ]; nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "price_parser" ]; diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix index 8894038470e9..0fd6e8acf27c 100644 --- a/pkgs/development/python-modules/pyppeteer-ng/default.nix +++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix @@ -21,7 +21,7 @@ pyee, pylint, pytest, - pytest-cov, + pytest-cov-stub, pytest-timeout, pytest-xdist, pytestCheckHook, @@ -43,8 +43,6 @@ buildPythonPackage rec { version = "2.0.0rc10"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "dgtlmoon"; repo = "pyppeteer-ng"; @@ -96,7 +94,7 @@ buildPythonPackage rec { pydocstyle pylint pytest - pytest-cov + pytest-cov-stub pytest-timeout pytest-xdist readme-renderer From b3b340814c0d4ae2600ec020ecb19ed3d8a91510 Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Tue, 2 Dec 2025 11:54:39 -0800 Subject: [PATCH 2/2] python3Packages.{pyppeteer-ng,price-parser,panzi-json-logic}: add passthru.updateScript --- pkgs/development/python-modules/panzi-json-logic/default.nix | 3 +++ pkgs/development/python-modules/price-parser/default.nix | 3 +++ pkgs/development/python-modules/pyppeteer-ng/default.nix | 3 +++ 3 files changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/panzi-json-logic/default.nix b/pkgs/development/python-modules/panzi-json-logic/default.nix index 292c42f14a1d..28a8ee0a38fd 100644 --- a/pkgs/development/python-modules/panzi-json-logic/default.nix +++ b/pkgs/development/python-modules/panzi-json-logic/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + gitUpdater, unittestCheckHook, setuptools, }: @@ -24,6 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "json_logic" ]; + passthru.updateScript = gitUpdater { }; + meta = { description = "Pure Python 3 JsonLogic and CertLogic implementation."; homepage = "https://github.com/panzi/panzi-json-logic"; diff --git a/pkgs/development/python-modules/price-parser/default.nix b/pkgs/development/python-modules/price-parser/default.nix index 0eb2a7a68eaf..ecbed54a7c36 100644 --- a/pkgs/development/python-modules/price-parser/default.nix +++ b/pkgs/development/python-modules/price-parser/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + gitUpdater, pytestCheckHook, setuptools, pytest-cov-stub, @@ -31,6 +32,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "price_parser" ]; + passthru.updateScript = gitUpdater { }; + meta = { description = "Extract price amount and currency symbol from a raw text string"; homepage = "https://github.com/scrapinghub/price-parser"; diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix index 0fd6e8acf27c..b6e4e1165b84 100644 --- a/pkgs/development/python-modules/pyppeteer-ng/default.nix +++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix @@ -4,6 +4,7 @@ aiohttp, appdirs, buildPythonPackage, + gitUpdater, certifi, diff-match-patch, fetchFromGitHub, @@ -147,6 +148,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyppeteer" ]; + passthru.updateScript = gitUpdater { }; + meta = { description = "Headless chrome/chromium automation library (unofficial port of puppeteer)"; mainProgram = "pyppeteer-install";