Merge branch 'master' into staging-next

A mass darwin rebuild from master (#55784).
This commit is contained in:
Vladimír Čunát
2019-02-17 07:58:47 +01:00
62 changed files with 838 additions and 413 deletions

View File

@@ -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;
};
}

View File

@@ -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 ];

View File

@@ -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;
};
}

View File

@@ -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