From ad94a1619a5b673f279b0a81ddf28a2e8d2d14cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 15:56:48 +0200 Subject: [PATCH 1/4] python312Packages.twill: refactor --- .../python-modules/twill/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index ddea5117a6c0..0a1738ccb8c9 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,40 +1,48 @@ { lib , buildPythonPackage , fetchPypi +, httpx , lxml -, requests , pyparsing +, pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "twill"; version = "3.2.3"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-m4jrxx7udWkRXzYS0Yfd14tKVHt8kGYPn2eTa4unOdc="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ + httpx lxml - requests pyparsing ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "twill" ]; - # pypi package comes without tests, other homepage does not provide all verisons - doCheck = false; - meta = with lib; { description = "A simple scripting language for Web browsing"; homepage = "https://twill-tools.github.io/twill/"; + changelog = "https://github.com/twill-tools/twill/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; From 490b52b3397239d331e3bc87d80cde5f1a35d808 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 16:26:35 +0200 Subject: [PATCH 2/4] python312Packages.quixote: init at 3.6 A small and flexible Python Web application framework https://pypi.org/project/Quixote/ --- .../python-modules/quixote/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/quixote/default.nix diff --git a/pkgs/development/python-modules/quixote/default.nix b/pkgs/development/python-modules/quixote/default.nix new file mode 100644 index 000000000000..557a59390fb9 --- /dev/null +++ b/pkgs/development/python-modules/quixote/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "quixote"; + version = "3.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "Quixote"; + inherit version; + hash = "sha256-78t6tznI3+vIRkWNi0HDPGhR8aGaET3IMXQvmAPdSSY="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "quixote" ]; + + disabledTestPaths = [ + # Test has additional requirements + "quixote/ptl/test/test_ptl.py" + ]; + + meta = with lib; { + description = "A small and flexible Python Web application framework"; + homepage = "https://pypi.org/project/Quixote/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 092730d89008..8ba934720ea5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12899,6 +12899,8 @@ self: super: with self; { quil = callPackage ../development/python-modules/quil { }; + quixote = callPackage ../development/python-modules/quixote { }; + qutip = callPackage ../development/python-modules/qutip { }; qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; From 92f92fab5dba8b69ca634a5130ad4e8ad377822d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 16:35:08 +0200 Subject: [PATCH 3/4] python312Packages.twill: 3.2.3 -> 3.2.4 Changelog: https://github.com/twill-tools/twill/releases/tag/v3.2.4 --- .../python-modules/twill/default.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 0a1738ccb8c9..aa8f2babd137 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -6,25 +6,35 @@ , pyparsing , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, quixote , setuptools }: buildPythonPackage rec { pname = "twill"; - version = "3.2.3"; + version = "3.2.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-m4jrxx7udWkRXzYS0Yfd14tKVHt8kGYPn2eTa4unOdc="; + hash = "sha256-YlZKvOGxLWwGh+MqCXf8tfruxLK60H73k1VQhGOSTc8="; }; + pythonRelaxDeps = [ + "lxml" + ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + dependencies = [ httpx lxml @@ -33,6 +43,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + quixote + ]; + + disabledTestPaths = [ + # pytidylib is abandoned + "tests/test_tidy.py" ]; pythonImportsCheck = [ From 7679a71d5c023dd6975d18487b7b702b582e0004 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 16:42:45 +0200 Subject: [PATCH 4/4] python312Packages.twill: format with nixfmt --- .../python-modules/twill/default.nix | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index aa8f2babd137..08e8ad74de22 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchPypi -, httpx -, lxml -, pyparsing -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, quixote -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + httpx, + lxml, + pyparsing, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + quixote, + setuptools, }: buildPythonPackage rec { @@ -23,17 +24,11 @@ buildPythonPackage rec { hash = "sha256-YlZKvOGxLWwGh+MqCXf8tfruxLK60H73k1VQhGOSTc8="; }; - pythonRelaxDeps = [ - "lxml" - ]; + pythonRelaxDeps = [ "lxml" ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ httpx @@ -51,9 +46,7 @@ buildPythonPackage rec { "tests/test_tidy.py" ]; - pythonImportsCheck = [ - "twill" - ]; + pythonImportsCheck = [ "twill" ]; meta = with lib; { description = "A simple scripting language for Web browsing";