From 099e51a6b1f0ff93ff4eede9d1f89628a73eecaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Apr 2024 14:22:42 +0000 Subject: [PATCH 1/3] python312Packages.protego: 0.3.0 -> 0.3.1 --- pkgs/development/python-modules/protego/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index 2a4e89cc6071..8270223d1c7e 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "protego"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Protego"; - hash = "sha256-BCKL/95Ma8ujHPZSm6LP1uG3CAj9wdLLQwG+ayjWxWg="; + hash = "sha256-6UQw0NJcu/I5vISdhsXlRPveUx/Mz6BZlTx9o0ShcSw="; }; nativeCheckInputs = [ pytestCheckHook ]; From ee4e254e140d56fd19c28b9ad1ddf9552e42f9b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 Apr 2024 16:38:09 +0200 Subject: [PATCH 2/3] python312Packages.protego: refactor --- .../python-modules/protego/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index 8270223d1c7e..c31b731535bd 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -3,12 +3,13 @@ , fetchPypi , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "protego"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,15 +19,23 @@ buildPythonPackage rec { hash = "sha256-6UQw0NJcu/I5vISdhsXlRPveUx/Mz6BZlTx9o0ShcSw="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; - pythonImportsCheck = [ "protego" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "protego" + ]; meta = with lib; { - description = "A pure-Python robots.txt parser with support for modern conventions"; + description = "Module to parse robots.txt files with support for modern conventions"; homepage = "https://github.com/scrapy/protego"; changelog = "https://github.com/scrapy/protego/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } From 7ce68d26528be6ea75709d84c7c8d2603485a781 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 Apr 2024 16:38:36 +0200 Subject: [PATCH 3/3] python312Packages.protego: format with nixfmt --- .../python-modules/protego/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index c31b731535bd..4374576b8e8d 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -19,17 +20,11 @@ buildPythonPackage rec { hash = "sha256-6UQw0NJcu/I5vISdhsXlRPveUx/Mz6BZlTx9o0ShcSw="; }; - nativeBuildInputs = [ - setuptools - ]; + nativeBuildInputs = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "protego" - ]; + pythonImportsCheck = [ "protego" ]; meta = with lib; { description = "Module to parse robots.txt files with support for modern conventions";