From bfffad723c3d1efdae5215b88ccfb69041527a95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 07:30:23 +0000 Subject: [PATCH 1/7] python311Packages.mechanize: 0.4.8 -> 0.4.9 --- pkgs/development/python-modules/mechanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 3060c2f4607c..8896aa4b515d 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.8"; + version = "0.4.9"; src = fetchPypi { inherit pname version; - hash = "sha256-XoasB3c1fgBusEzSj37Z+BHUjf+mA9OJGsbSuSKA3JE="; + hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE="; }; propagatedBuildInputs = [ html5lib ]; From 1fcdc3f05a6e030c602c7c1549a3b19767d21d04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 10:11:13 +0100 Subject: [PATCH 2/7] python311Packages.mechanize: add changelog to meta --- pkgs/development/python-modules/mechanize/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 8896aa4b515d..8e5d147d303a 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -20,7 +20,8 @@ buildPythonPackage rec { meta = with lib; { description = "Stateful programmatic web browsing in Python"; homepage = "https://github.com/python-mechanize/mechanize"; + changelog = "https://github.com/python-mechanize/mechanize/blob/v${version}/ChangeLog"; license = "BSD-style"; + maintainers = with maintainers; [ ]; }; - } From 1863301fcbc7a9708db91b9ea29476cf82167e1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 10:11:53 +0100 Subject: [PATCH 3/7] python311Packages.mechanize: specify license --- pkgs/development/python-modules/mechanize/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 8e5d147d303a..390f2955493b 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { description = "Stateful programmatic web browsing in Python"; homepage = "https://github.com/python-mechanize/mechanize"; changelog = "https://github.com/python-mechanize/mechanize/blob/v${version}/ChangeLog"; - license = "BSD-style"; + license = licenses.bsd3; maintainers = with maintainers; [ ]; }; } From 05d8f0746fecab486b3c0fa127c1ae58f78054f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 10:13:40 +0100 Subject: [PATCH 4/7] python311Packages.mechanize: add format - disable on unsupported Python releases --- pkgs/development/python-modules/mechanize/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 390f2955493b..b02de661fc78 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -2,18 +2,24 @@ , buildPythonPackage , fetchPypi , html5lib +, pythonOlder }: buildPythonPackage rec { pname = "mechanize"; version = "0.4.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE="; }; - propagatedBuildInputs = [ html5lib ]; + propagatedBuildInputs = [ + html5lib + ]; doCheck = false; From d281268e6fd5d31b2b1823caac85dc1670ee7e66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 10:17:06 +0100 Subject: [PATCH 5/7] python311Packages.mechanize: add pythonImportsCheck --- pkgs/development/python-modules/mechanize/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index b02de661fc78..735098f432cd 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -23,6 +23,10 @@ buildPythonPackage rec { doCheck = false; + pythonImportsCheck = [ + "mechanize" + ]; + meta = with lib; { description = "Stateful programmatic web browsing in Python"; homepage = "https://github.com/python-mechanize/mechanize"; From 4ca74b16b04386c92b3e118123c40e358cf558ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 10:18:22 +0100 Subject: [PATCH 6/7] python311Packages.mechanize: migrate to pyproject --- pkgs/development/python-modules/mechanize/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 735098f432cd..0394572cff4e 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -3,12 +3,13 @@ , fetchPypi , html5lib , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "mechanize"; version = "0.4.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ html5lib ]; From 10349c347326deffdd74953e6e00c02c47daaabe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 10:25:06 +0100 Subject: [PATCH 7/7] python311Packages.mechanize: enable tests --- .../python-modules/mechanize/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 0394572cff4e..0f89f3f42525 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , html5lib +, pytestCheckHook , pythonOlder , setuptools }: @@ -26,12 +27,26 @@ buildPythonPackage rec { html5lib ]; - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "mechanize" ]; + disabledTestPaths = [ + # Tests require network access + "test/test_urllib2_localnet.py" + "test/test_functional.py" + ]; + + disabledTests = [ + # Tests require network access + "test_pickling" + "test_password_manager" + ]; + meta = with lib; { description = "Stateful programmatic web browsing in Python"; homepage = "https://github.com/python-mechanize/mechanize";