Merge remote-tracking branch 'NixOS/master' into staging

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

@@ -1,26 +1,31 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, cython, pytest, numpy, scipy, matplotlib, pandas, tabulate }:
+{ lib, buildPythonPackage, fetchPypi
+, pytest, numpy, scipy, matplotlib, pandas, tabulate, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "acoustics";
-  version = "0.1.2";
+  version = "0.2.0.post1";
 
-  buildInputs = [ cython pytest ];
+  checkInputs = [ pytest ];
   propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b75a47de700d01e704de95953a6e969922b2f510d7eefe59f7f8980ad44ad1b7";
+    sha256 = "738218db41ff1b1f932eabb700e400d84141af6f29392aab5f7be1b19758f806";
   };
 
-  # Tests not distributed
+  # Tests look in wrong place for test data
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  checkPhase = ''
+    py.test tests
+  '';
+
+  disabled = pythonOlder "3.6";
+
+  meta = with lib; {
     description = "A package for acousticians";
     maintainers = with maintainers; [ fridh ];
     license = with licenses; [ bsd3 ];
     homepage = https://github.com/python-acoustics/python-acoustics;
-    broken = true;
   };
 }

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aiorpcx";
-  version = "0.10.2";
+  version = "0.10.4";
 
   src = fetchPypi {
     inherit version;
     pname = "aiorpcX";
-    sha256 = "1p88k15jh0d2a18pnnbfcamsqi2bxvmmhpizmdlxfdxf8vy5ggyj";
+    sha256 = "15jhklvl0ncy3mb2h9zkahky9fzzr1amgjylm2k3mvlpyn2dbpz6";
   };
 
   propagatedBuildInputs = [ attrs ];

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

@@ -0,0 +1,18 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "beanstalkc";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "98978e57797320146f4b233286d9a02f65d20bad0168424118839fc608085280";
+  };
+
+  meta = {
+    description = "A simple beanstalkd client library for Python";
+    maintainers = with stdenv.lib.maintainers; [ aanderse ];
+    license = with stdenv.lib.licenses; [ asl20 ];
+    homepage = https://github.com/earl/beanstalkc;
+  };
+}

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

@@ -30,6 +30,8 @@ buildPythonPackage rec {
   ];
   propagatedBuildInputs = [ six ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with stdenv.lib; {
     homepage = "https://falcao.it/HTTPretty/";
     description = "HTTP client request mocking tool";

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

@@ -16,6 +16,7 @@
 , lxml
 , html5lib
 , beautifulsoup4
+, hypothesis
 , openpyxl
 , tables
 , xlwt
@@ -28,16 +29,17 @@ let
 
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.23.4";
+  version = "0.24.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4";
+    sha256 = "435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af";
   };
 
-  checkInputs = [ pytest glibcLocales moto ];
+  checkInputs = [ pytest glibcLocales moto hypothesis ];
 
-  buildInputs = [ cython ] ++ optional isDarwin libcxx;
+  nativeBuildInputs = [ cython ];
+  buildInputs = optional isDarwin libcxx;
   propagatedBuildInputs = [
     dateutil
     scipy

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

@@ -0,0 +1,41 @@
+{lib, fetchFromGitHub, python, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4}:
+
+buildPythonPackage rec {
+  pname = "wrf-python";
+  version = "1.3.1.1";
+
+  src = fetchFromGitHub {
+    owner = "NCAR";
+    repo = "wrf-python";
+    rev = version;
+    sha256 = "12mm7x1r5md6x28vmwyh6k655pgsv6knj8ycmjbxxk8bk7qsj74h";
+  };
+
+  propagatedBuildInputs = [
+    wrapt
+    numpy
+    xarray
+  ];
+  buildInputs = [
+    gfortran
+  ] ++ lib.optional (pythonOlder "3.3") mock;
+  
+  checkInputs = [
+    netcdf4
+  ];
+
+  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+    cd ./test/ci_tests
+    python utests.py
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "WRF postprocessing library for Python";
+    homepage = http://wrf-python.rtfd.org;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ mhaselsteiner ];
+	};
+}