From 3ef8ee6b24bd31ad00ce49fbd88b19be0ddd98ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 1 Jun 2022 02:45:58 +0000 Subject: [PATCH 1/2] python310Packages.Wand: run tests --- pkgs/development/python-modules/Wand/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 86aad7708ad9..8535f0afb708 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , imagemagickBig +, pytestCheckHook }: buildPythonPackage rec { @@ -19,8 +20,17 @@ buildPythonPackage rec { "magick_home = '${imagemagickBig}'" ''; - # tests not included with pypi release - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/emcconville/wand/issues/558 + "test_forward_fourier_transform" + "test_inverse_fourier_transform" + # our imagemagick doesn't set MagickReleaseDate + "test_configure_options" + ]; passthru.imagemagick = imagemagickBig; From 86ccaac0dec8542488de0db57e3567d5a02c051a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 13 Nov 2022 19:27:14 -0800 Subject: [PATCH 2/2] python310Packages.wand: rename from Wand --- pkgs/development/python-modules/{Wand => wand}/default.nix | 5 +++-- pkgs/servers/calibre-web/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{Wand => wand}/default.nix (94%) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/wand/default.nix similarity index 94% rename from pkgs/development/python-modules/Wand/default.nix rename to pkgs/development/python-modules/wand/default.nix index 8535f0afb708..396642b0c13a 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -6,11 +6,12 @@ }: buildPythonPackage rec { - pname = "Wand"; + pname = "wand"; version = "0.6.10"; src = fetchPypi { - inherit pname version; + pname = "Wand"; + inherit version; sha256 = "sha256-Nz9KfyhmyGjDHOkQ4fmzapLRMmQKIAaOwXzqMoT+3Fc="; }; diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 50198b392797..6047eae3c962 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { sqlalchemy tornado unidecode - Wand + wand werkzeug ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b9d3fc1835e9..44b34cf2071f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -208,6 +208,7 @@ mapAliases ({ tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 + Wand = wand; # added 2022-11-13 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 websocket_client = websocket-client; # added 2021-06-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 617356b42c4e..c0496e6189b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11777,7 +11777,7 @@ self: super: with self; { wallbox = callPackage ../development/python-modules/wallbox { }; - Wand = callPackage ../development/python-modules/Wand { }; + wand = callPackage ../development/python-modules/wand { }; wandb = callPackage ../development/python-modules/wandb { };