Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1527134

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

@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "aniso8601";
-  version = "6.0.0";
+  version = "7.0.0";
 
   meta = with stdenv.lib; {
     description = "Parses ISO 8601 strings.";
@@ -17,6 +17,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bylfskk08ahyma25i8w3mcd0kywpxqx6icv5p7m1z0i8srak9mq";
+    sha256 = "07jgf55yq2j2q76gaj3hakflnxg8yfkarzvrmq33i1dp6xk2ngai";
   };
 }

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

@@ -15,6 +15,10 @@ buildPythonPackage rec {
 
   checkInputs =  [ pytest glibcLocales ];
 
+  # Necessary for the tests to pass on Darwin with sandbox enabled.
+  # Black starts a local server and needs to bind a local address.
+  __darwinAllowLocalNetworking = true;
+
   # Don't know why these tests fails
   checkPhase = ''
     LC_ALL="en_US.UTF-8" pytest \

pkgs/development/python-modules/cassandra-driver/default.nix

@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "cassandra-driver";
-  version = "3.17.1";
+  version = "3.18.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1y6pnm7vzg9ip1nbly3i8mmwqmcy8g38ix74vdzvvaxwxil9bmvi";
+    sha256 = "1w9a7fdl626m977cjj9zclh4a0mr3s4q9jpwm1fsmpi7v3gbribi";
   };
 
   buildInputs = [

pkgs/development/python-modules/gtts-token/default.nix

@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "gtts-token";
+  version = "1.1.3";
+
+  src = fetchPypi {
+    pname = "gTTS-token";
+    inherit version;
+    sha256 = "9d6819a85b813f235397ef931ad4b680f03d843c9b2a9e74dd95175a4bc012c5";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  # Tests only in github repo, require working internet connection
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Calculates a token to run the Google Translate text to speech";
+    homepage = https://github.com/boudewijn26/gTTS-token;
+    license = licenses.mit;
+    maintainers = [ maintainers.makefu ];
+  };
+}
+

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

@@ -1,4 +1,4 @@
-{ stdenv, libusb1, udev, fetchPypi, buildPythonPackage, cython }:
+{ stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }:
 
 buildPythonPackage rec {
   pname = "hidapi";
@@ -9,10 +9,13 @@ buildPythonPackage rec {
     sha256 = "e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97";
   };
 
-  propagatedBuildInputs = [ libusb1 udev cython ];
+  propagatedBuildInputs =
+    stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++
+    stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation ] ++
+    [ cython ];
 
   # Fix the USB backend library lookup
-  postPatch = ''
+  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     libusb=${libusb1.dev}/include/libusb-1.0
     test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
     sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py

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

@@ -25,5 +25,6 @@ buildPythonPackage rec {
     description = "Image augmentation for machine learning experiments";
     license = licenses.mit;
     maintainers = with maintainers; [ cmcdragonkai ];
+    broken = true; # opencv-python bindings aren't available yet, and look non-trivial
   };
 }

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

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, scikitlearn }:
+
+buildPythonPackage rec {
+  pname = "mlrose";
+  version = "1.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0vsvqrf1wbbj8i198rqd87hf8rlq7fmv8mmibv8f9rhj0w8729p5";
+  };
+
+  propagatedBuildInputs = [ scikitlearn ];
+
+  postPatch = ''
+    sed -i 's,sklearn,scikit-learn,g' setup.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Machine Learning, Randomized Optimization and SEarch";
+    homepage    = "https://github.com/gkhayes/mlrose";
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

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

@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , isPy3k
 , requests
 , requests_oauthlib
@@ -18,16 +18,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.6.4";
+  version = "0.6.7";
   pname = "msrest";
 
-  # no tests in PyPI tarball
-  # see https://github.com/Azure/msrest-for-python/pull/152
-  src = fetchFromGitHub {
-    owner = "Azure";
-    repo = "msrest-for-python";
-    rev = "v${version}";
-    sha256 = "0ilrc06qq0dw4qqzq1dq2vs6nymc39h19w52dwcyawwfalalnjzi";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07136g3j7zgcvkxki4v6q1p2dm1nzzc28181s8dwic0y4ml8qlq5";
   };
 
   propagatedBuildInputs = [
@@ -48,6 +44,6 @@ buildPythonPackage rec {
     description = "The runtime library 'msrest' for AutoRest generated Python clients.";
     homepage = "https://azure.microsoft.com/en-us/develop/python/";
     license = licenses.mit;
-    maintainers = with maintainers; [ bendlas ];
+    maintainers = with maintainers; [ bendlas jonringer ];
   };
 }

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

@@ -1,25 +1,42 @@
 { pkgs
+, lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, isPy3k
 , adal
 , msrest
+, mock
+, httpretty
+, pytest
+, pytest-asyncio
 }:
 
 buildPythonPackage rec {
-  version = "0.6.0";
+  version = "0.6.1";
   pname = "msrestazure";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "06s04f6nng4na2663kc12a3skiaqb631nscjfwpsrx4lzkf8bccr";
+  # Pypi tarball doesnt include tests
+  # see https://github.com/Azure/msrestazure-for-python/pull/133
+  src = fetchFromGitHub {
+    owner = "Azure";
+    repo = "msrestazure-for-python";
+    rev = "v${version}";
+    sha256 = "09swndz57131b8x57mzibnsr1sv0l80pk62p89q99gsd6mvc389c";
   };
 
   propagatedBuildInputs = [ adal msrest ];
 
+  checkInputs = [ httpretty mock pytest ]
+                ++ lib.optional isPy3k [ pytest-asyncio ];
+
+  checkPhase = ''
+    pytest tests/
+  '';
+
   meta = with pkgs.lib; {
     description = "The runtime library 'msrestazure' for AutoRest generated Python clients.";
     homepage = "https://azure.microsoft.com/en-us/develop/python/";
     license = licenses.mit;
-    maintainers = with maintainers; [ bendlas ];
+    maintainers = with maintainers; [ bendlas jonringer ];
   };
 }

pkgs/development/python-modules/ndg-httpsclient/default.nix

@@ -5,7 +5,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.2";
+  version = "0.5.1";
   pname = "ndg-httpsclient";
 
   propagatedBuildInputs = [ pyopenssl ];
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner = "cedadev";
     repo = "ndg_httpsclient";
     rev = version;
-    sha256 = "1kk4knv029j0cicfiv23c1rayc1n3f1j3rhl0527gxiv0qv4jw8h";
+    sha256 = "0lhsgs4am4xyjssng5p0vkfwqncczj1dpa0vss4lrhzq86mnn5rz";
   };
 
   # uses networking

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

@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "progressbar2";
-  version = "3.39.3";
+  version = "3.42.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fgy4327xzn232br4as74r6ddg5v6ycmfwga7xybp4s1w0cm8nwf";
+    sha256 = "0a26r022lvz0vvwvhq2rfyl6h0hxbayvgbnajpnc0fc8f4gzr1n0";
   };
 
   postPatch = ''

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

@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchPypi
+, isPy34, isPy35, isPy27
+, numpy, pytz, six, enum-compat, sentinel
+}:
+
+buildPythonPackage rec {
+  pname = "rig";
+  version = "2.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5a3896dbde3f291c5dd34769e7329ef5d5e4da34fee53479bd13dc5e5d540b8a";
+  };
+
+  propagatedBuildInputs = [ numpy pytz six sentinel enum-compat ];
+
+  # This is the list of officially supported versions. Other versions may work
+  # as well.
+  disabled = !(isPy35 || isPy34 || isPy27);
+
+  # Test Phase is only supported in development sources.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A collection of tools for developing SpiNNaker applications";
+    homepage = "https://github.com/project-rig/rig";
+    license = licenses.gpl2;
+  };
+}

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

@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "sasmodels";
-  version = "0.99";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "SasView";
     repo = "sasmodels";
     rev = "v${version}";
-    sha256 = "1lcvn42h29i0mg4i75xn0dbk711q9ycyhm3h95skqy8i61qmjrx6";
+    sha256 = "082wnk10axincc4a62zxyr33l7v80yf7iz630y3421b50fwwyd8j";
   };
 
   buildInputs = [ opencl-headers ];

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

@@ -0,0 +1,17 @@
+{ lib, buildPythonPackage, fetchPypi}:
+
+buildPythonPackage rec {
+  pname = "sentinel";
+  version = "0.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "c00ba2a4f240ea4c5414059a696d6e128730272cb2c631b2eff42e86da1f89b3";
+  };
+
+  meta = with lib; {
+    description = "Create sentinel and singleton objects";
+    homepage = "https://github.com/eddieantonio/sentinel";
+    license = licenses.mit;
+  };
+}