Merge master into staging-next

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

@@ -1,24 +1,24 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder, isPy36
 , nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils, pyopenssl }:
 
 buildPythonPackage rec {
   pname = "aioimaplib";
-  version = "0.7.14";
+  version = "0.7.15";
 
   # PyPI tarball doesn't ship tests
   src = fetchFromGitHub {
     owner = "bamthomas";
     repo = pname;
     rev = version;
-    sha256 = "150v3czh53sqakfqgjyj1w39mdfcxmpnrk2pbmq63jkq7r6njl0l";
+    sha256 = "15nny3y8pwaizq1zmkg43ym5jszk2hs010z12yn2d0j1fibymwbj";
   };
 
-  disabled = pythonOlder "3.4";
+  disabled = !(isPy3k && pythonOlder "3.7");
 
   checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils pyopenssl ];
 
   # https://github.com/bamthomas/aioimaplib/issues/35
-  doCheck = false;
+  doCheck = !isPy36;
 
   meta = with lib; {
     description = "Python asyncio IMAP4rev1 client library";

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

@@ -1,14 +1,18 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "beanstalkc";
-  version = "0.4.0";
+  version = "0.5.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "98978e57797320146f4b233286d9a02f65d20bad0168424118839fc608085280";
+  src = fetchFromGitHub {
+    owner = "bosondata";
+    repo = "beanstalkc";
+    rev = "v${version}";
+    sha256 = "1dpb1yimp2pfnikmgsb2fr9x6h8riixlsx3xfqphnfvrid49vw5s";
   };
 
+  doCheck = false;
+
   meta = {
     description = "A simple beanstalkd client library for Python";
     maintainers = with stdenv.lib.maintainers; [ aanderse ];

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

@@ -10,6 +10,8 @@ buildPythonPackage rec {
     sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93";
   };
 
+  # pull request for this patch is https://github.com/MagicStack/contextvars/pull/9
+  patches = [ ./immutables_version.patch ];
   propagatedBuildInputs = [ immutables ];
 
   meta = {

pkgs/development/python-modules/contextvars/immutables_version.patch

@@ -0,0 +1,11 @@
+--- ./setup.py	2018-07-30 15:40:14.000000000 +0000
++++ ./setup.py	2019-02-12 18:33:24.984430303 +0000
+@@ -17,7 +17,7 @@
+     packages=['contextvars'],
+     provides=['contextvars'],
+     install_requires=[
+-        'immutables==0.6',
++        'immutables>=0.6',
+     ],
+     license='Apache License, Version 2.0',
+     classifiers=[

pkgs/development/python-modules/dask-mpi/default.nix

@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, dask
+, distributed
+, mpi4py
+, pytest
+, requests
+}:
+
+buildPythonPackage rec {
+  version = "1.0.2";
+  pname = "dask-mpi";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1apzzh90gl9jx43z0gjmgpniplhvqziafi2l8688a0g01vw7ibjv";
+  };
+
+  checkInputs = [ pytest requests ];
+  propagatedBuildInputs = [ dask distributed mpi4py ];
+
+  checkPhase = ''
+    py.test dask_mpi
+  '';
+
+  # hardcoded mpirun path in tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dask/dask-mpi;
+    description = "Deploy Dask using mpi4py";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}

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

@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, numba
+, ndtypes
+, xnd
+, libndtypes
+, libxnd
+, libgumath
+, isPy27
+}:
+
+buildPythonPackage {
+  pname = "gumath";
+  disabled = isPy27;
+  inherit (libgumath) src version meta;
+
+  checkInputs = [ numba ];
+  propagatedBuildInputs = [ ndtypes xnd ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'add_include_dirs = [".", "libgumath", "ndtypes/python/ndtypes", "xnd/python/xnd"] + INCLUDES' \
+                'add_include_dirs = [".", "${libndtypes}/include", "${libxnd}/include", "${libgumath}/include"]' \
+      --replace 'add_library_dirs = ["libgumath", "ndtypes/libndtypes", "xnd/libxnd"] + LIBS' \
+                'add_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' \
+      --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \
+                'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]'
+  '';
+}

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

@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, libndtypes
+, isPy27
+}:
+
+buildPythonPackage {
+  pname = "ndtypes";
+  disabled = isPy27;
+  inherit (libndtypes) version src meta;
+
+  propagatedBuildInputs = [ numpy ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'include_dirs = ["libndtypes"]' \
+                'include_dirs = ["${libndtypes}/include"]' \
+      --replace 'library_dirs = ["libndtypes"]' \
+                'library_dirs = ["${libndtypes}/lib"]' \
+      --replace 'runtime_library_dirs = ["$ORIGIN"]' \
+                'runtime_library_dirs = ["${libndtypes}/lib"]'
+  '';
+
+  postInstall = ''
+    mkdir $out/include
+    cp python/ndtypes/*.h $out/include
+  '';
+}

pkgs/development/python-modules/pyside/apiextractor.nix

@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
     description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
     license = stdenv.lib.licenses.gpl2;
     homepage = http://www.pyside.org/docs/apiextractor/;
-    maintainers = [ stdenv.lib.maintainers.chaoflow ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }

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

@@ -21,7 +21,6 @@ buildPythonPackage rec {
     description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
     license = lib.licenses.lgpl21;
     homepage = http://www.pyside.org;
-    maintainers = [ lib.maintainers.chaoflow ];
     broken = true;
   };
 }

pkgs/development/python-modules/pyside/generatorrunner.nix

@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
     description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
     license = stdenv.lib.licenses.gpl2;
     homepage = http://www.pyside.org/docs/generatorrunner/;
-    maintainers = [ stdenv.lib.maintainers.chaoflow ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/development/python-modules/pyside/shiboken.nix

@@ -33,7 +33,7 @@ buildPythonPackage rec {
     description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
     license = lib.licenses.gpl2;
     homepage = http://www.pyside.org/docs/shiboken/;
-    maintainers = [ lib.maintainers.chaoflow ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }

pkgs/development/python-modules/pyside/tools.nix

@@ -19,7 +19,7 @@ buildPythonPackage rec {
     description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
     license = lib.licenses.gpl2;
     homepage = http://www.pyside.org;
-    maintainers = [ lib.maintainers.chaoflow ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }

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

@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+, scipy
+, numba
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "sparse";
+  version = "0.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2ac6fcbf68b38b999eae98467cf4880b942c13a72036868f78d65a10aeba808d";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [
+    numpy
+    scipy
+    numba
+  ];
+
+  checkPhase = ''
+    pytest sparse
+  '';
+
+  meta = with lib; {
+    description = "Sparse n-dimensional arrays computations";
+    homepage = https://github.com/pydata/sparse/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}

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

@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, ndtypes
+, libndtypes
+, libxnd
+, isPy27
+}:
+
+buildPythonPackage {
+  pname = "xnd";
+  disabled = isPy27;
+  inherit (libxnd) version src meta;
+
+  propagatedBuildInputs = [ ndtypes ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \
+                'include_dirs = ["${libndtypes}/include", "${ndtypes}/include", "${libxnd}/include"]' \
+      --replace 'library_dirs = ["libxnd", "ndtypes/libndtypes"] + LIBS' \
+                'library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \
+      --replace 'runtime_library_dirs = ["$ORIGIN"]' \
+                'runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \
+  '';
+
+  postInstall = ''
+    mkdir $out/include
+    cp python/xnd/*.h $out/include
+  '';
+}