Merge master into staging-next

pkgs/development/python-modules/parsimonious/default.nix

@@ -17,6 +17,9 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
   propagatedBuildInputs = [ six ];
 
+  # performance tests tend to fail sometimes
+  NOSE_EXCLUDE = "test_benchmarks";
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/erikrose/parsimonious";
     description = "Fast arbitrary-lookahead parser written in pure Python";

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";