about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2021-01-01 07:21:11 +0000
committerGitHub <noreply@github.com>2021-01-01 07:21:11 +0000
commit60c6607dc87f9f1c34dc028b7d7c8bf7006067f7 (patch)
tree444ae4e2ba96b54c64b1019face931084502033f
parent299c95ac165e9e4c5e55788e02031a155e8f7723 (diff)
parent5d84589c3d74fe522f1930e7bc816481f366d658 (diff)
downloadnixlib-60c6607dc87f9f1c34dc028b7d7c8bf7006067f7.tar
nixlib-60c6607dc87f9f1c34dc028b7d7c8bf7006067f7.tar.gz
nixlib-60c6607dc87f9f1c34dc028b7d7c8bf7006067f7.tar.bz2
nixlib-60c6607dc87f9f1c34dc028b7d7c8bf7006067f7.tar.lz
nixlib-60c6607dc87f9f1c34dc028b7d7c8bf7006067f7.tar.xz
nixlib-60c6607dc87f9f1c34dc028b7d7c8bf7006067f7.tar.zst
nixlib-60c6607dc87f9f1c34dc028b7d7c8bf7006067f7.zip
Merge pull request #107906 from Mic92/wordcloud
python3.pkgs.wordcloud: 1.6.0 -> 1.8.1
-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";