about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2020-12-29 22:07:31 +0100
committerJörg Thalheim <joerg@thalheim.io>2020-12-30 07:19:10 +0100
commit5d84589c3d74fe522f1930e7bc816481f366d658 (patch)
treec99f962eff1699a30f5f86db8177242afca745d5
parente71df047a0e0244a6b84bba506d0284fd093deb5 (diff)
downloadnixlib-5d84589c3d74fe522f1930e7bc816481f366d658.tar
nixlib-5d84589c3d74fe522f1930e7bc816481f366d658.tar.gz
nixlib-5d84589c3d74fe522f1930e7bc816481f366d658.tar.bz2
nixlib-5d84589c3d74fe522f1930e7bc816481f366d658.tar.lz
nixlib-5d84589c3d74fe522f1930e7bc816481f366d658.tar.xz
nixlib-5d84589c3d74fe522f1930e7bc816481f366d658.tar.zst
nixlib-5d84589c3d74fe522f1930e7bc816481f366d658.zip
python3.pkgs.wordcloud: 1.6.0 -> 1.8.1
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
-rw-r--r--pkgs/development/python-modules/wordcloud/default.nix21
1 files changed, 16 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix
index d005527b4c35..6ed44c1e0c20 100644
--- a/pkgs/development/python-modules/wordcloud/default.nix
+++ b/pkgs/development/python-modules/wordcloud/default.nix
@@ -3,31 +3,42 @@
 , mock
 , numpy
 , pillow
-, pytest
+, cython
 , pytestcov
+, pytest
+, fetchpatch
 }:
 
 buildPythonPackage rec {
   pname = "word_cloud";
-  version = "1.6.0";
+  version = "1.8.1";
 
   # tests are not included in pypi tarball
   src = fetchFromGitHub {
     owner = "amueller";
     repo = pname;
     rev = version;
-    sha256 = "1ncjr90m3w3b4zi23kw6ai11gxahdyah96x8jb2yn2x4573022x2";
+    sha256 = "sha256-4EFQfv+Jn9EngUAyDoJP0yv9zr9Tnbrdwq1YzDacB9Q=";
   };
 
+  nativeBuildInputs = [ cython ];
   propagatedBuildInputs = [ matplotlib numpy pillow ];
 
   # Tests require extra dependencies
   checkInputs = [ mock pytest pytestcov ];
-  # skip tests which make assumptions about installation
+
   checkPhase = ''
-    pytest -k 'not cli_as_executable'
+    PATH=$out/bin:$PATH pytest test
   '';
 
+  patches = [
+    (fetchpatch {
+      # https://github.com/amueller/word_cloud/pull/616
+      url = "https://github.com/amueller/word_cloud/commit/858a8ac4b5b08494c1d25d9e0b35dd995151a1e5.patch";
+      sha256 = "sha256-+aDTMPtOibVwjPrRLxel0y4JFD5ERB2bmJi4zRf/asg=";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "A little word cloud generator in Python";
     homepage = "https://github.com/amueller/word_cloud";