Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2019-10-03 01:47:08 +02:00
514 changed files with 8443 additions and 3195 deletions

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Logbook";
version = "1.4.3";
version = "1.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "a5a96792abd8172c80d61b7530e134524f20e2841981038031e602ed5920fef5";
sha256 = "0mvsig6sk4dywpw5naah1npf6h621qzhg0sd427j5znr06a2ksqs";
};
checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ];

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Wand";
version = "0.5.6";
version = "0.5.7";
src = fetchPypi {
inherit pname version;
sha256 = "126gpx6zj7fpx87v1qgicpfdahmmkqqmd2a8abllq0jlckrmjsyh";
sha256 = "0wvqzppflph3fkgkyv3k11ga28fv1g1bz8sbf227d7pql8c6ia8k";
};
postPatch = ''

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "affine";
version = "2.2.2";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "146slzpj2b220dmbmrxib030wymvplawxzn7gcgnbahgm500y3gz";
sha256 = "00jil4q3b17qml6azim7s7zar6qb1vhsf0g888y637m23bpms11f";
};
checkInputs = [ pytest ];

View File

@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "azure-batch";
version = "7.0.0";
version = "8.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1q8mdjdbz408z2j0y1zxqg9zg8j1v84p0dnh621vq73a2x1g298j";
sha256 = "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi";
};
propagatedBuildInputs = [

View File

@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "azure-cli-telemetry";
version = "1.0.2";
version = "1.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "14wmxdsrrlnixaj52q37rrvp9wg5b54gf5wn2z1vq68kxpg1s560";
sha256 = "0sf27pcz653h0cnxsg47nndilhqlw9fl019aqbnji2vn967r9rnl";
};
propagatedBuildInputs = [

View File

@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "azure-datalake-store";
version = "0.0.45";
version = "0.0.47";
src = fetchPypi {
inherit pname version;
sha256 = "1k2wkpdv30wjmi53zdcsa5xfqw8gyak39na73ja6rb7wy8196wbd";
sha256 = "19fkkabr76r851r95kh5dpk4bdn3jkysv3aij6i2x99mkb4vxg2m";
};
propagatedBuildInputs = [

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-batch";
version = "6.0.0";
version = "7.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "dc929d2a0a65804c28a75dc00bb84ba581f805582a09238f4e7faacb15f8a2a3";
sha256 = "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n";
};
propagatedBuildInputs = [

View File

@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cognitiveservices";
version = "4.0.0";
version = "5.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "05zbgy1d6mschqv6y14byr4nwdnv48x9skx4rbsbz1fcqqx3j2sd";
sha256 = "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906";
};
propagatedBuildInputs = [

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
version = "0.7.0";
version = "0.8.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1d9xzf9ydlhwlsk7ij64ji1r2j0l7bwaykwngcy5lh8sdxax305r";
sha256 = "0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb";
};
propagatedBuildInputs = [

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datamigration";
version = "2.2.0";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0bixyya9afas0sv2wji7ivfi64z4dvv8p1gjnppibi5zas1mb4zw";
sha256 = "0pc5pf7jpkpdrad5hafh2hki01dpx5773whp6kpxp71gh265mm5n";
};
propagatedBuildInputs = [

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-devtestlabs";
version = "3.0.0";
version = "4.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "b3d5b2919021bf45f0acdd34ab23dc9b0435d9d0a6b472e5008128fb8521e700";
sha256 = "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
};
propagatedBuildInputs = [

View File

@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "4.0.0";
version = "5.0.0";
pname = "azure-mgmt-network";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0h2lnigmh2arq0ppwjk8h9rqxplj6s7h7qxwyv7wirk0ydx6cfd9";
sha256 = "03ymxm3ryhgh4f1pw00fiyb3lxv2w6nkvn8xnj91h8xdd34flqzc";
};
postInstall = if isPy3k then "" else ''

View File

@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-servicefabric";
version = "0.3.0";
version = "0.4.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0cirsp8wnsswba6gbmw4s2ljsjwi3855my063gvi2mqr55spvx2n";
sha256 = "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2";
};
propagatedBuildInputs = [

View File

@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-signalr";
version = "0.2.0";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0k39hf6r2rfy2wyxd9czha2mwmcqf6sc1v69jyh6ml3slbliivlz";
sha256 = "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a";
};
propagatedBuildInputs = [

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-sql";
version = "0.12.0";
version = "0.13.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "8399702e9d1836f3b040ce0c93d8dc089767d66edb9224a3b8a6c9ab7e8ff01f";
sha256 = "184jma28nyn4c52mjj0g0p6rci6kajsdjqy8mbdaisphpjl4f77l";
};
propagatedBuildInputs = [

View File

@@ -34,5 +34,6 @@ buildPythonPackage rec {
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.asl20;
maintainers = with maintainers; [ olcai ];
broken = true; # this should propagate over 70 azure packages, many of which are not added yet
};
}

View File

@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "bidict";
version = "0.18.0";
version = "0.18.2";
src = fetchPypi {
inherit pname version;
sha256 = "4d10630fd5d86b7c165387473c5180e7fca7635f12e24b1f426aac259c72c81a";
sha256 = "0br3ljvd56nqifr1mbwksvl5jjk40pihrrjlyn7hmc40yq6m5bvh";
};
nativeBuildInputs = [ setuptools_scm ];

View File

@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "blis";
version = "0.2.4";
version = "0.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "0c5hd0bim9134sk8wb31cqzvi9c380rbl5zwjiwrq8nnix8a2k1d";
sha256 = "1khh02z6wryrnrxlx2wrxzhaqsg5hlgypy0643rvi4zcqanvdpym";
};
nativeBuildInputs = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "BLAS-like linear algebra library";
homepage = https://github.com/explosion/cython-blis;
license = licenses.mit;
license = licenses.bsd3;
maintainers = with maintainers; [ danieldk ];
};
};
}

View File

@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "canmatrix";
version = "0.7";
version = "0.8";
# uses fetchFromGitHub as PyPi release misses test/ dir
src = fetchFromGitHub {
owner = "ebroecker";
repo = pname;
rev = version;
sha256 = "0q8qb282nfgirl8r2i9c8whm3hvr14ig2r42ssgnv2hya971cwjq";
sha256 = "1wzflapyj2j4xsi7d7gfmznmxbgr658n092xyq9nac46rbhpcphg";
};
propagatedBuildInputs = [

View File

@@ -1,14 +1,11 @@
{ lib
, buildPythonPackage
, fetchPypi
, configobj
, terminaltables
, tabulate
{ lib, buildPythonPackage, fetchPypi, isPy27
, backports_csv
, wcwidth
, pytest
, configobj
, mock
, isPy27
, pytest
, tabulate
, terminaltables
, wcwidth
}:
buildPythonPackage rec {
@@ -27,6 +24,9 @@ buildPythonPackage rec {
wcwidth
] ++ (lib.optionals isPy27 [ backports_csv ]);
# namespace collision between backport.csv and backports.configparser
doCheck = !isPy27;
checkInputs = [ pytest mock ];
checkPhase = ''

View File

@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "clikit";
version = "0.3.1";
version = "0.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "0f8ba0kbka208faxdlny8byqb2w2cdyspq73zalymq8vr91796lp";
sha256 = "1pvzq3glf4sjgrm0wyxln3s6vicdc9q8r5sgaiqmxdmd9pylw0xm";
};
propagatedBuildInputs = [

View File

@@ -39,6 +39,11 @@ buildPythonPackage rec {
pomegranate
];
postPatch = ''
substituteInPlace setup.py \
--replace "pandas >= 0.20.1, < 0.25.0" "pandas"
'';
meta = with lib; {
homepage = "https://cnvkit.readthedocs.io";
description = "A Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data";

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "cupy";
version = "6.2.0";
version = "6.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0d6liaavgqks772rqam53qha3yk6dfw24i0pj3izxvvawzhlp10z";
sha256 = "1q38riv63110ch170c1pyhq5jfbg8y0qmcdsqn8vb9sb79amvg93";
};
checkInputs = [

View File

@@ -3,7 +3,6 @@
, fetchFromGitHub
, click
, click-default-group
, sanic
, jinja2
, hupper
, pint
@@ -14,17 +13,20 @@
, black
, aiohttp
, beautifulsoup4
, uvicorn
, asgiref
, aiofiles
}:
buildPythonPackage rec {
pname = "datasette";
version = "0.28";
version = "0.29.3";
src = fetchFromGitHub {
owner = "simonw";
repo = "datasette";
rev = version;
sha256 = "1m2s03gyq0ghjc3s0b5snpinisddywpgii2f0zqa3v4ljmzanx7h";
sha256 = "0cib7pd4z240ncck0pskzvizblhwkr42fsjpd719wdxy4scs7yqa";
};
buildInputs = [ pytestrunner ];
@@ -32,11 +34,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [
click
click-default-group
sanic
jinja2
hupper
pint
pluggy
uvicorn
aiofiles
];
checkInputs = [
@@ -45,6 +48,7 @@ buildPythonPackage rec {
aiohttp
beautifulsoup4
black
asgiref
];
postConfigure = ''
@@ -52,8 +56,9 @@ buildPythonPackage rec {
--replace "click-default-group==1.2" "click-default-group" \
--replace "Sanic==0.7.0" "Sanic" \
--replace "hupper==1.0" "hupper" \
--replace "pint==0.8.1" "pint" \
--replace "Jinja2==2.10.1" "Jinja2"
--replace "pint~=0.8.1" "pint" \
--replace "Jinja2==2.10.1" "Jinja2" \
--replace "uvicorn~=0.8.4" "uvicorn"
'';
# many tests require network access

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dbf";
version = "0.98.2";
version = "0.98.3";
src = fetchPypi {
inherit pname version;
sha256 = "0d8m3zhhxy1f35r1s8k0s218iz86bs6v89vy65lslrxbdg5pjia0";
sha256 = "01d71vya2x87f3kl9x0s8xp0n7wixn6ksrd054y7idq3n1mjaxzh";
};
propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];

View File

@@ -28,12 +28,12 @@
buildPythonPackage rec {
pname = "distributed";
version = "2.3.0";
version = "2.4.0";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
sha256 = "15lb6fz3739nkyxi1igzm5p2lk40digkc9fkzjqx1jpymfac9dwl";
sha256 = "1cz7n84g8dgx3cs28qnrh1sd6lka9lx8llysxa6mxyz6wf3ngl9h";
};
checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];

View File

@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "django-allauth";
version = "0.39.1";
version = "0.40.0";
# no tests on PyPI
src = fetchFromGitHub {
owner = "pennersr";
repo = pname;
rev = version;
sha256 = "1kplkanhj26z3i6p0l1r5lczha4pavcx96vj3kpcp1rvyk1v0f7r";
sha256 = "10id4k01p1hg5agb8cmllg8mv4kc7ryl75br10idwxabqqp4vla1";
};
propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "django-cors-headers";
version = "3.0.2";
version = "3.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0b11nkcviwv5dqnlmv63bgzciczb51wairm8b6wr6sda4p7y5wzb";
sha256 = "0g1vqhc36ay518vs67kkf6w76ay27dc73w145bpwgp9fky81r6z6";
};
propagatedBuildInputs = [ django ];

View File

@@ -0,0 +1,45 @@
{ lib, fetchPypi, buildPythonPackage, pythonOlder, routerFeatures
, janus, ncclient, paramiko, pyyaml, sanic }:
let
# The `routerFeatures` flag optionally brings in some somewhat heavy
# dependencies, in order to enable interacting with routers
opts = if routerFeatures then {
prePatch = ''
substituteInPlace ./setup.py --replace "extra_deps = []" "extra_deps = router_feature_deps"
'';
extraBuildInputs = [ janus ncclient paramiko ];
} else {
prePatch = "";
extraBuildInputs = [];
};
in
buildPythonPackage rec {
pname = "entrance";
version = "1.1.10";
src = fetchPypi {
inherit pname version;
sha256 = "080qkvkmfw4004cl721l5bvpg001xz8vs6q59dg797kqxfrwk5kw";
};
# The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later
disabled = pythonOlder "3.6";
# No useful tests
doCheck = false;
propagatedBuildInputs = [ pyyaml sanic ] ++ opts.extraBuildInputs;
prePatch = opts.prePatch;
meta = with lib; {
description = "A server framework for web apps with an Elm frontend";
homepage = https://github.com/ensoft/entrance;
license = licenses.mit;
maintainers = with maintainers; [ simonchatts ];
};
}

View File

@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "flask-restplus";
version = "0.12.1";
version = "0.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "3fad697e1d91dfc13c078abcb86003f438a751c5a4ff41b84c9050199d2eab62";
sha256 = "0p4zz8b5bwbw7w0vhbyihl99d2gw13cb81rxzj4z626a1cnl8vm6";
};
checkInputs = [ nose blinker tzlocal mock rednose ];

View File

@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "holoviews";
version = "1.12.3";
version = "1.12.5";
src = fetchPypi {
inherit pname version;
sha256 = "df64c0f163fe8b43d28cf5bcdeb8abc45d882aedca525b870f17987edd0c80a2";
sha256 = "15cay2fnhwqr42s4hiq37b8q87sir5k59p14g96mvg5p0gjnhg3w";
};
propagatedBuildInputs = [

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "identify";
version = "1.4.5";
version = "1.4.7";
src = fetchPypi {
inherit pname version;
sha256 = "1z8xjvpkj599h3s76q05y10iysjjky7b0s5g3zicfyxhzm7x59a3";
sha256 = "0vi9qxgnjgxdk4wj3c5ha3hjmc97j3pw1zh2cg39jprapn4rb4fq";
};
# Tests not included in PyPI tarball

View File

@@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, pytest, pythonOlder }:
buildPythonPackage rec {
pname = "janus";
version = "0.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef";
};
disabled = pythonOlder "3.6";
checkInputs = [ pytest ];
meta = with lib; {
description = "Mixed sync-async queue";
homepage = "https://github.com/aio-libs/janus";
license = licenses.asl20;
maintainers = [ maintainers.simonchatts ];
};
}

View File

@@ -1,37 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
{ lib, buildPythonPackage, fetchPypi, isPy27
, fasteners
, jinja2
, pbr
, mock
, python-jenkins
, pyyaml
, six
, stevedore
, isPy27
, fasteners
, jinja2
}:
buildPythonPackage rec {
pname = "jenkins-job-builder";
version = "3.0.1";
disabled = !isPy27;
version = "3.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "16x97pdr90x3xsc1xl66l7q77pgja5dzsk921by2h09k7dvxaqmh";
sha256 = "02ggscsyrrqk06w9lb43km77qgcj8cixrrm5mkigr4gz2pzdjhmf";
};
postPatch = ''
export HOME=$TMPDIR
'';
propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore fasteners jinja2 ];
propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ];
# Need to fix test deps
doCheck = false;
# Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs
checkPhase = ''$out/bin/jenkins-jobs --help'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
homepage = "https://docs.openstack.org/infra/system-config/jjb.html";
license = licenses.asl20;

View File

@@ -3,10 +3,11 @@
, fetchPypi
, fetchpatch
, stdenv
, sphinx
, numpydoc
, pytest
, python-lz4
, setuptools
, sphinx
}:
@@ -37,7 +38,7 @@ buildPythonPackage rec {
];
checkInputs = [ sphinx numpydoc pytest ];
propagatedBuildInputs = [ python-lz4 ];
propagatedBuildInputs = [ python-lz4 setuptools ];
# test_disk_used is broken: https://github.com/joblib/joblib/issues/57
# test_dispatch_multiprocessing is broken only on Darwin.

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "kconfiglib";
version = "10.36.0";
version = "12.12.1";
src = fetchPypi {
inherit pname version;
sha256 = "1qhy4vv1rpgx4r1la14symxv3cpz7klqakn1rqdagwyaqp667g9b";
sha256 = "0afc0gidh0pjb0ll99xifzs5z14g365crfj935614zp9w8fcchp0";
};
# doesnt work out of the box but might be possible

View File

@@ -1,14 +1,15 @@
{ stdenv, buildPythonPackage, fetchPypi
{ stdenv, buildPythonPackage, fetchPypi, isPy27
, dbus-python, setuptools_scm, entrypoints, secretstorage
, pytest, pytest-flake8 }:
buildPythonPackage rec {
pname = "keyring";
version = "19.1.0";
version = "19.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "13frfmws03jdyz9wxb4ylkvk80qiyb6a3h3sn7wx3ry97bn5li3a";
sha256 = "1cvlm48fggl12m19j9vcnrlplidr2sjf8h3pdyki58f9y357q0wi";
};
nativeBuildInputs = [ setuptools_scm ];

View File

@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "lark-parser";
version = "0.7.3";
version = "0.7.5";
src = fetchFromGitHub {
owner = "lark-parser";
repo = "lark";
rev = version;
sha256 = "1d8dbn8wwqqvvjyhai813sqkx6366d8jkjq0gkyh51692pflmwrp";
sha256 = "1k9s62ddv6pghzp1yak2ld6sk92zm4sz1xqp8zkzyh3xqdsmfa0f";
};
# tests of Nearley support require js2py

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libversion";
version = "1.1.4";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "0xp0wv4s1537s0iqa1ih3kfh1p70s7d1fkwhvrnbj8m98yjij84q";
sha256 = "1p3snjlsg11vhba8h286h19kn6azlxbywg9f6rdhj8sfraccqlmk";
};
nativeBuildInputs = [ pkgconfig ];

View File

@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "marshmallow-sqlalchemy";
version = "0.17.0";
version = "0.19.0";
meta = {
homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "17pnbv28n9vy3q66ckxfdbb9k1riy6s8lg63zfm5jsx00f0zqqnn";
sha256 = "175ydlxmj8pbkrv3wcrsd9jg7smnxhln2y0i691yafhidxgy8fmm";
};
propagatedBuildInputs = [ marshmallow sqlalchemy ];

View File

@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "meld3";
version = "1.0.2";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0n4mkwlpsqnmn0dm0wm5hn9nkda0nafl0jdy5sdl5977znh59dzp";
sha256 = "1fbyafwi0d54394hkmp65nf6vk0qm4kipf5z60pdp4244rvadz8y";
};
doCheck = false;

View File

@@ -0,0 +1,20 @@
{ lib, buildPythonPackage, fetchPypi, pysha3 }:
buildPythonPackage rec {
pname = "merkletools";
version = "1.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "0pdik5sil0xcrwdcgdfy86c5qcfrz24r0gfc8m8bxa0i7h7x2v9l";
};
propagatedBuildInputs = [ pysha3 ];
meta = with lib; {
description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs";
homepage = "https://github.com/Tierion/pymerkletools";
license = licenses.mit;
maintainers = with maintainers; [ chiiruno ];
};
}

View File

@@ -0,0 +1,30 @@
{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
buildPythonPackage rec {
version = "2.3.2";
pname = "opt_einsum";
src = fetchPypi {
inherit version pname;
sha256 = "0ny3v8x83mzpwmqjdzqhzy2pzwyy4wx01r1h9i29xw3yvas69m6k";
};
checkInputs = [
pytest_4
];
checkPhase = ''
pytest
'';
propagatedBuildInputs = [
numpy
];
meta = {
description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
homepage = http://optimized-einsum.readthedocs.io;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ teh ];
};
}

View File

@@ -1,31 +1,26 @@
{ buildPythonPackage, fetchPypi, lib, numpy, pytest, pytestpep8, pytestcov }:
{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
buildPythonPackage rec {
version = "2.3.2";
version = "3.0.1";
pname = "opt_einsum";
src = fetchPypi {
inherit version pname;
sha256 = "0ny3v8x83mzpwmqjdzqhzy2pzwyy4wx01r1h9i29xw3yvas69m6k";
sha256 = "1agyvq26x0zd6j3wzgczl4apx8v7cb9w1z50azn8c3pq9jphgfla";
};
checkInputs = [
pytest
pytestpep8
pytestcov
];
propagatedBuildInputs = [ numpy ];
checkInputs = [ pytest_4 ];
checkPhase = ''
pytest
'';
propagatedBuildInputs = [
numpy
];
meta = {
meta = with lib; {
description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
homepage = http://optimized-einsum.readthedocs.io;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ teh ];
license = licenses.mit;
maintainers = with maintainers; [ teh ];
};
}

View File

@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "peewee";
version = "3.10.0";
version = "3.11.1";
# pypi release does not provide tests
src = fetchFromGitHub {
owner = "coleifer";
repo = pname;
rev = version;
sha256 = "166h7vy3j0v4h2jnyiwpmpqgmn95381a5ra40ghghy0fqd9v49g8";
sha256 = "0q84r9x99h9a3kqs3i12bgk8rz5my8vpjngg8yaqd2kzsb6gynp8";
};

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pex";
version = "1.6.8";
version = "1.6.11";
src = fetchPypi {
inherit pname version;
sha256 = "1zibkc074dvk69bkiipfzn2l9glgzs26g16j2ny5lzq320wqszkj";
sha256 = "034170w0qh20qkfaha2rpnccm31f7snhb4r9cd079v4v2x2swybk";
};
nativeBuildInputs = [ setuptools ];

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.10.17";
version = "8.10.19";
src = fetchPypi {
inherit pname version;
sha256 = "023rcv3qishd5n33gj22dzgq51kzpk41ckcmim96s1xvdbd2sxg9";
sha256 = "0xdj4faxvcmkw1war203yxcb66jhhbgscjyqxjifknr0mxax3ngw";
};
meta = {

View File

@@ -10,6 +10,7 @@
, pkginfo
, html5lib
, shellingham
, subprocess32
, tomlkit
, typing
, pathlib2
@@ -63,7 +64,7 @@ in buildPythonPackage rec {
shellingham
tomlkit
] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
++ lib.optionals isPy27 [ virtualenv functools32 ];
++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ];
postInstall = ''
mkdir -p "$out/share/bash-completion/completions"

View File

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pomegranate";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
repo = pname;
owner = "jmschrei";
rev = "v${version}";
sha256 = "0gf7z343ag4g7pfccn1sdap3ihkaxrc9ca75awjhmsa2cyqs66df";
sha256 = "19kdzqyj86aldsls68a6ymrs8sasv3a8r4wjmfdmcif1xsg6zb4q";
};
propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ];

View File

@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "py3dns";
version = "3.2.0";
version = "3.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "8e88c0648c4d38a880f08aeb05a6e5cb48b8ce2602d381caafc6c71698ee3c21";
sha256 = "1r25f0ys5p37bhld7m7n4gb0lrysaym3w318w2f8bncq7r3d81qz";
};
preConfigure = ''

View File

@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pycdio";
version = "2.0.0";
version = "2.1.0";
disabled = !isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1a1h0lmfl56a2a9xqhacnjclv81nv3906vdylalybxrk4bhrm3hj";
sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn";
};
prePatch = "sed -i -e '/DRIVER_BSDI/d' pycdio.py";

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "pydantic";
version = "0.31";
version = "0.32.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0x9xc5hpyrlf05dc4bx9f7v51fahxcahkvh0ij8ibay15nwli53d";
sha256 = "0q565m7d2rapjy6ylbdpd00z9zk99pkqg110191racp1d34kb4va";
};
propagatedBuildInputs = [

View File

@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pyftdi";
version = "0.29.4";
version = "0.30.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "0jy0xbqvmhy0nq9v86759d96raa8p52yq8ik3ji5kjlx7cizq67v";
sha256 = "0avmxz38bkl6hp3fn1jm31qahsdp76j454mfnpxwx5wlk35iss09";
};
propagatedBuildInputs = [ pyusb pyserial ];

View File

@@ -20,6 +20,10 @@ buildPythonPackage rec {
checkInputs = [ pytestrunner pytest_4 hypothesis ];
postPatch = ''
substituteInPlace setup.py --replace 'pytest<5' 'pytest'
'';
meta = with stdenv.lib; {
homepage = https://github.com/tobgu/pyrsistent/;
description = "Persistent/Functional/Immutable data structures";

View File

@@ -1,21 +1,46 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, taglib
, cython
, pytest
, glibcLocales
, fetchpatch
}:
buildPythonPackage rec {
pname = "pytaglib";
version = "1.4.5";
src = fetchPypi {
inherit pname version;
sha256 = "8aec64bc146a9f72778a0d2d1f3448f58be6ebea68f64b0ff88ea8e0f4dc5d8f";
src = fetchFromGitHub {
owner = "supermihi";
repo = pname;
rev = "v${version}";
sha256 = "1gvvadlgk8ny8bg76gwvvfcwp1nfgrjphi60h5f9ha7h5ff1g2wb";
};
patches = [
# fix tests on python 2.7
(fetchpatch {
url = https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch;
sha256 = "1kv3c68vimx5dc8aacvzphiaq916avmprxddi38wji8p2ql6vngj";
})
# properly install pyprinttags
(fetchpatch {
url = https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch;
sha256 = "0pi0dcq7db5fd3jnbwnfsfsgxvlhnm07z5yhpp93shk0s7ci2bwp";
})
(fetchpatch {
url = https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch;
sha256 = "0h259vzj1l0gpibdf322yclyd10x5rh1anzhsjj2ghm6rj6q0r0m";
})
];
postPatch = ''
substituteInPlace setup.py --replace "'pytest-runner', " ""
'';
buildInputs = [ taglib cython ];
checkInputs = [ pytest glibcLocales ];

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-gitlab";
version = "1.9.0";
version = "1.11.0";
src = fetchPypi {
inherit pname version;
sha256 = "1p0i6gsl4mcv6w1sm0rsxq9bq2cmmg3n7c0dniqlvqmzkk62qqhx";
sha256 = "1icnf27wrndglhr7h3gbns6dn6a98y3i46cmyrxpnir79446sdgy";
};
propagatedBuildInputs = [ requests six ];

View File

@@ -44,6 +44,7 @@ in buildPythonPackage rec {
})
];
dontUseCmakeConfigure = true;
preConfigure = lib.optionalString cudaSupport ''
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
'' + lib.optionalString (cudaSupport && cudnn != null) ''

View File

@@ -0,0 +1,43 @@
{ lib,
fetchFromGitHub,
buildPythonPackage,
boto,
inflection,
pytest,
mock,
requests,
six,
urllib3 }:
buildPythonPackage rec {
pname = "qds_sdk";
version = "1.12.0";
# pypi does not contain tests, using github sources instead
src = fetchFromGitHub {
owner = "qubole";
repo = "qds-sdk-py";
rev = "V${version}";
sha256 = "18xhvlcfki8llv7fw2r5yfk20zds3gr78b4klwm9mkvhlhwds9rx";
};
propagatedBuildInputs = [
boto
inflection
requests
six
urllib3
];
checkInputs = [ pytest mock ];
checkPhase = ''
py.test --disable-pytest-warnings tests
'';
meta = with lib; {
description = "A Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API";
homepage = "https://github.com/qubole/qds-sdk-py";
license = licenses.asl20;
maintainers = with maintainers; [ shahrukh330 ];
};
}

View File

@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "qtconsole";
version = "4.5.2";
version = "4.5.5";
src = fetchPypi {
inherit pname version;
sha256 = "0z6d2rmzrx2dzbx94xxmsrl6vn6jjpzvb6014y2bqhwr7znbjzkn";
sha256 = "1nf64wl3ni0q69ihcm5y6zl12mmg7gvkhrb98hbgwv3yb09787mr";
};
checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];

View File

@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "radio_beam";
version = "0.3.1";
version = "0.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "1wgd9dyz3pcc9ighkclb6qfyshwbg35s57lz6k62jhcxpvp8r5zb";
sha256 = "0g1nqiikv023ab60gfqrvc13kfjv8m70bpfk264vlliaq6mvxdf2";
};
propagatedBuildInputs = [ astropy ];

View File

@@ -1,24 +1,24 @@
{ buildPythonPackage, lib, fetchFromGitHub, isPy3k
, cython
, cython, setuptools
, numpy, affine, attrs, cligj, click-plugins, snuggs, gdal
, pytest, pytestcov, packaging, hypothesis, boto3, mock
}:
buildPythonPackage rec {
pname = "rasterio";
version = "1.0.25";
version = "1.0.28";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
owner = "mapbox";
repo = "rasterio";
rev = version;
sha256 = "15m0ajcrxjdzahdkxa3mylk87l31zz48k99bvmmx96hcl31cf347";
sha256 = "05rn2ijjv64a765gkpwcq3bb933gzp35zj4l9sk0agh19462myjx";
};
checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock;
nativeBuildInputs = [ cython gdal ];
propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs ];
propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs setuptools ];
meta = with lib; {
description = "Python package to read and write geospatial raster data";

View File

@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "reproject";
version = "0.4";
version = "0.5.1";
doCheck = false; # tests require pytest-astropy
src = fetchPypi {
inherit pname version;
sha256 = "dbbb18a8b211292c7ce61121b8538fc279540337be1c05cabc7570c5aca6d734";
sha256 = "069rha55cbm8vsi1qf8zydds42lgkcc97sd57hmjw1mgiz025xrp";
};
propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ];

View File

@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "resampy";
version = "0.2.1";
version = "0.2.2";
# No tests in PyPi Archive
src = fetchFromGitHub {
owner = "bmcfee";
repo = pname;
rev = version;
sha256 = "0a2bxj042y62dimm2i4vglbhpwbybam07mcl67cb6pmfsw9fbqhj";
sha256 = "0qmkxl5sbgh0j73n667vyi7ywzh09iaync91yp1j5rrcmwsn0qfs";
};
checkInputs = [ pytest pytestcov ];

View File

@@ -15,15 +15,76 @@
, pytest-sanic
, pytest-sugar
, pytest-benchmark
# required just httpcore / requests-async
, h11
, h2
, certifi
, chardet
, idna
, requests
, rfc3986
, uvicorn
}:
let
# This version of sanic depends on two packages that have been deprecated by
# their development teams:
#
# - requests-async [where first line of pypi says to use `http3` instead now]
# - httpcore [where the homepage redirects to `http3` now]
#
# Since no other packages in nixpkg depend on these right now, define these
# packages just as local dependencies here, to avoid bloat.
httpcore = buildPythonPackage rec {
pname = "httpcore";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0n3bamaixxhcm27gf1ws3g6rkamvqx87087c88r6hyyl52si1ycn";
};
propagatedBuildInputs = [ certifi chardet h11 h2 idna rfc3986 ];
# relax pinned old version of h11
postConfigure = ''
substituteInPlace setup.py \
--replace "h11==0.8.*" "h11"
'';
# LICENCE.md gets propagated without this, causing collisions
postInstall = ''
rm $out/LICENSE.md
'';
};
requests-async = buildPythonPackage rec {
pname = "requests-async";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "8731420451383196ecf2fd96082bfc8ae5103ada90aba185888499d7784dde6f";
};
propagatedBuildInputs = [ requests httpcore ];
# LICENCE.md gets propagated without this, causing collisions
postInstall = ''
rm $out/LICENSE.md
'';
};
in
buildPythonPackage rec {
pname = "sanic";
version = "19.3.1";
version = "19.6.3";
src = fetchPypi {
inherit pname version;
sha256 = "ce434eb154872ca64493a6c3a288f11fd10bca0de7be7bf9f1d0d063185e51ec";
sha256 = "0b1qqsvdjkibrw5kgr0pm7n7jzb1403132wjmb0lx3k5wyvqfi95";
};
propagatedBuildInputs = [
@@ -31,6 +92,7 @@ buildPythonPackage rec {
aiofiles
websockets
multidict
requests-async
uvloop
ujson
];
@@ -44,11 +106,20 @@ buildPythonPackage rec {
pytest-sanic
pytest-sugar
pytest-benchmark
uvicorn
];
# Sanic says it needs websockets 7.x, but the changelog for 8.x is actually
# nearly compatible with sanic's use. So relax this constraint, with a small
# required code change.
postConfigure = ''
substituteInPlace setup.py \
--replace "websockets>=6.0,<7.0" "websockets"
substituteInPlace setup.py --replace \
"websockets>=7.0,<8.0" \
"websockets>=7.0,<9.0"
substituteInPlace sanic/websocket.py --replace \
"self.websocket.subprotocol = subprotocol" \
"self.websocket.subprotocol = subprotocol
self.websocket.is_client = False"
'';
# 10/500 tests ignored due to missing directory and

View File

@@ -22,6 +22,8 @@ buildPythonPackage rec {
requests flake8
];
dontUseCmakeConfigure = true;
disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([
"test_hello_develop" # tries setuptools develop install
"test_source_distribution" # pip has no way to install missing dependencies

View File

@@ -6,7 +6,7 @@
}:
buildPythonPackage rec {
version = "2.1.0";
version = "2.2.0";
pname = "sepaxml";
disabled = isPy27;
@@ -14,7 +14,7 @@ buildPythonPackage rec {
owner = "raphaelm";
repo = "python-sepaxml";
rev = version;
sha256 = "0lkb0nnyxmwvm6gkwls8w2290b66lwz9bv8p39wwcn7flabviwhj";
sha256 = "1qmgdcz61hs65m2fddwn9jpyk2sxifdb0f3jz1n0lgy774z0pmas";
};
propagatedBuildInputs = [

View File

@@ -4,22 +4,24 @@
, click-plugins
, colorama
, requests
, setuptools
, XlsxWriter
}:
buildPythonPackage rec {
pname = "shodan";
version = "1.14.0";
version = "1.17.0";
src = fetchPypi {
inherit pname version;
sha256 = "0c5x53757p6ihh1f8xqsal2gi9ikcl3464b38qinva51s0kkb58k";
sha256 = "1sh7a2dsal3kzcl4s9xbpl7hxhm9k55s5hiqdqqnafhvhnh0vmbz";
};
propagatedBuildInputs = [
click-plugins
colorama
requests
setuptools
XlsxWriter
];

View File

@@ -35,7 +35,9 @@ buildPythonPackage rec {
prePatch = ''
substituteInPlace setup.py \
--replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
--replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
--replace "thinc>=7.0.8,<7.1.0" "thinc>=7.0.8" \
--replace "blis>=0.2.2,<0.3.0" "blis>=0.2.2"
'';
propagatedBuildInputs = [

View File

@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "srsly";
version = "0.0.7";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1v9nn17q2lshnvnc8ff6nk53rggz2hgnmx4fj4czfr40125r98pk";
sha256 = "1l9yjp1w2vrkrynxrlrc0v47i2iq9059k4ni44nz23573xbdrh2w";
};
propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib;

View File

@@ -1,17 +1,17 @@
{ stdenv, buildPythonPackage, fetchPypi, pbr, six }:
{ stdenv, buildPythonPackage, fetchPypi, pbr, setuptools, six }:
buildPythonPackage rec {
pname = "stevedore";
version = "1.30.1";
version = "1.31.0";
src = fetchPypi {
inherit pname version;
sha256 = "1860zslirsqskc2iifljxcyly28zqgjpmkm7k3bj6zyqagzriq3v";
sha256 = "054apq55yg7058pmbnyc8jhrcpi9clmi0sm7znhwg0d676brywz0";
};
doCheck = false;
propagatedBuildInputs = [ pbr six ];
propagatedBuildInputs = [ pbr setuptools six ];
meta = with stdenv.lib; {
description = "Manage dynamic plugins for Python applications";

View File

@@ -5,23 +5,23 @@
, toolz
, zict
, six
, pytest
, pytest_4
, networkx
, distributed
, confluent-kafka
, graphviz
, requests
}:
buildPythonPackage rec {
pname = "streamz";
version = "0.5.1";
version = "0.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "80c9ded1d6e68d3b78339deb6e9baf93a633d84b4a8875221e337ac06890103f";
sha256 = "127rpdjgkcyjifmkqbhmqfbzlgi32n54rybrdxja610qr906y40c";
};
checkInputs = [ pytest networkx distributed confluent-kafka graphviz ];
propagatedBuildInputs = [
tornado
toolz
@@ -29,6 +29,15 @@ buildPythonPackage rec {
six
];
checkInputs = [
confluent-kafka
distributed
graphviz
networkx
pytest_4
requests
];
# Disable test_tcp_async because fails on sandbox build
checkPhase = ''
pytest --deselect=streamz/tests/test_sources.py::test_tcp_async \
@@ -37,7 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Pipelines to manage continuous streams of data";
homepage = https://github.com/mrocklin/streamz/;
homepage = "https://github.com/mrocklin/streamz";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
};

View File

@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "stripe";
version = "2.30.0";
version = "2.35.1";
# Tests require network connectivity and there's no easy way to disable
# them. ~ C.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "de6be07c9e8a350d588278186316f66c72af7036aa5e917d1a924fb875249034";
sha256 = "0rmzba8yig426anf8fxiacyvwchlsws746757sgvw748n8lrarbw";
};
propagatedBuildInputs = [ requests ];

View File

@@ -1,27 +1,33 @@
{ lib, buildPythonPackage, isPy3k, fetchPypi
{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi
, mock
, meld3
, pytest
, setuptools
}:
buildPythonPackage rec {
pname = "supervisor";
version = "3.3.5";
version = "4.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "1w3ahridzbc6rxfpbyx8lij6pjlcgf2ymzyg53llkjqxalp6sk8v";
sha256 = "02pindhq84hb9a7ykyaqw8i2iqb21h69lpmclyqh7fm1446rji4n";
};
checkInputs = [ mock ];
# wants to write to /tmp/foo which is likely already owned by another
# nixbld user on hydra
doCheck = !stdenv.isDarwin;
checkInputs = [ mock pytest ];
checkPhase = ''
pytest
'';
propagatedBuildInputs = [ meld3 ];
propagatedBuildInputs = [ meld3 setuptools ];
# Supervisor requires Python 2.4 or later but does not work on any version of Python 3. You are using version 3.6.5 (default, Mar 28 2018, 10:24:30)
disabled = isPy3k;
meta = {
meta = with lib; {
description = "A system for controlling process state under UNIX";
homepage = http://supervisord.org/;
license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt
maintainers = with lib.maintainers; [ zimbatm ];
license = licenses.free; # http://www.repoze.org/LICENSE.txt
maintainers = with maintainers; [ zimbatm ];
};
}

View File

@@ -26,6 +26,7 @@
, symlinkJoin
, keras-applications
, keras-preprocessing
, addOpenGLRunpath
}:
# We keep this binary build for two reasons:
@@ -76,6 +77,8 @@ in buildPythonPackage {
] ++ lib.optional (!isPy3k) mock
++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propageted input tensorflow-tensorboard which causes environment collisions.
# another possibility would be to have tensorboard only in the buildInputs
@@ -94,7 +97,12 @@ in buildPythonPackage {
lib.optionalString stdenv.isLinux ''
rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}"
internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so"
find $out \( -name '*.so' -or -name '*.so.*' \) -exec patchelf --set-rpath "$rrPath" {} \;
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
patchelf --set-rpath "$rrPath" "$lib"
${lib.optionalString cudaSupport ''
addOpenGLRunpath "$lib"
''}
done
'';

View File

@@ -1,4 +1,5 @@
{ stdenv, pkgs, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
, addOpenGLRunpath
# Python deps
, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
# Python libraries
@@ -112,7 +113,7 @@ let
nativeBuildInputs = [
swig which pythonEnv
];
] ++ lib.optional cudaSupport addOpenGLRunpath;
buildInputs = [
jemalloc
@@ -203,6 +204,7 @@ let
TF_NEED_CUDA = tfFeature cudaSupport;
TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}";
GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin";
GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc";
TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
postPatch = ''
@@ -295,6 +297,21 @@ let
bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "$PWD/dist"
cp -Lr "$PWD/dist" "$python"
'';
postFixup = lib.optionalString cudaSupport ''
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
addOpenGLRunpath "$lib"
done
'';
};
meta = with stdenv.lib; {
description = "Computation using data flow graphs for scalable machine learning";
homepage = http://tensorflow.org;
license = licenses.asl20;
maintainers = with maintainers; [ jyp abbradar ];
platforms = platforms.linux;
broken = !(xlaSupport -> cudaSupport);
};
};
@@ -337,6 +354,14 @@ in buildPythonPackage {
tensorflow-tensorboard
];
nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
postFixup = lib.optionalString cudaSupport ''
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
addOpenGLRunpath "$lib"
done
'';
# Actual tests are slow and impure.
# TODO try to run them anyway
# TODO better test (files in tensorflow/tools/ci_build/builds/*test)
@@ -346,12 +371,5 @@ in buildPythonPackage {
passthru.libtensorflow = bazel-build.out;
meta = with stdenv.lib; {
description = "Computation using data flow graphs for scalable machine learning";
homepage = http://tensorflow.org;
license = licenses.asl20;
maintainers = with maintainers; [ jyp abbradar ];
platforms = platforms.linux;
broken = !(xlaSupport -> cudaSupport);
};
inherit (bazel-build) meta;
}

View File

@@ -28,11 +28,11 @@
buildPythonPackage rec {
pname = "thinc";
version = "7.0.8";
version = "7.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "191admjvhqsbxpqn73q42i0i8kvlblj0k6p0z9p7n3pcxzl75nsw";
sha256 = "0j2nfzz154j9331gzwa5rmc2f5ljjan728rhgsx6c7jwg323mmsa";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

View File

@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "tilestache";
version = "1.51.13";
version = "1.51.14";
disabled = !isPy27;
src = fetchPypi {
pname = "TileStache";
inherit version;
sha256 = "11e15dd85501345bcfeb18dce5b1c8fb74ac8d867df2520afe0eefe1edd85f27";
sha256 = "1qjrabl6qr7i6yj6v647ck92abcyklb0vmb6h6kj7x8v2cj5xbvk";
};
propagatedBuildInputs = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ];

View File

@@ -2,11 +2,11 @@
python.pkgs.buildPythonPackage rec {
pname = "tld";
version = "0.9.3";
version = "0.9.6";
src = fetchPypi {
inherit pname version;
sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp";
sha256 = "0figmf80y715zv6viqan2nyzpg9aia5dyl25nskirpm5lh1s99w9";
};
propagatedBuildInputs = with python.pkgs; [ six ];

View File

@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "twine";
version = "1.13.0";
version = "1.15.0";
src = fetchPypi {
inherit pname version;
sha256 = "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc";
sha256 = "11rpd653zcgzkq3sgwkzs3mpxl3r5rij59745ni84ikv8smjmlm3";
};
propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ];

View File

@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "umap-learn";
version = "0.3.9";
version = "0.3.10";
src = fetchFromGitHub {
owner = "lmcinnes";
repo = "umap";
rev = version;
sha256 = "1cdc7hs3vwzxvzs34l9a06q8rvks29wj6swyj8zvwr32knxch8a9";
sha256 = "0nck5va5km7qkbrhn15dsn0p2mms9kc641lcypy7l8haqgm44h8x";
};
checkInputs = [

View File

@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "uncompyle6";
version = "3.3.3";
version = "3.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "9c492a560ff1c8713f0947cfc3ab755c368e26421d13087cd5b6c01b1529ea5b";
sha256 = "0w4m0jywjb0w1y73nkb05zmjxb4plpfi3w2g1rgrf45afa2aqm8z";
};
checkInputs = [ nose pytest hypothesis six ];

View File

@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "uproot";
version = "3.8.0";
version = "3.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "06s0lym5md59pj8w89acnwk0i0hh92az187h4gz22mb849h308pw";
sha256 = "1ir3gxgfidw0lx0d2x1lmmxg9brb5fam3ncfihba2b0bvyq9bqzd";
};
nativeBuildInputs = [ pytestrunner ];

View File

@@ -43,6 +43,12 @@ buildPythonPackage rec {
pytest
'';
# LICENCE.md gets propagated without this, causing collisions
# see https://github.com/encode/uvicorn/issues/392
postInstall = ''
rm $out/LICENSE.md
'';
meta = with lib; {
homepage = https://www.uvicorn.org/;
description = "The lightning-fast ASGI server";

View File

@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "validators";
version = "0.13.0";
version = "0.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "ea9bf8bf22aa692c205e12830d90b3b93950e5122d22bed9eb2f2fece0bba298";
sha256 = "1bhla1l8gbks572zp4f254acz23822dz2mp122djxvp328i87b7h";
};
propagatedBuildInputs = [

View File

@@ -3,6 +3,7 @@
, buildPythonPackage
, pythonOlder
, pytest
, stdenv
}:
buildPythonPackage rec {
@@ -18,6 +19,9 @@ buildPythonPackage rec {
disabled = pythonOlder "3.3";
# Tests fail on Darwin with `OSError: AF_UNIX path too long`
doCheck = !stdenv.isDarwin;
meta = with lib; {
description = "WebSocket implementation in Python 3";
homepage = "https://github.com/aaugustin/websockets";

View File

@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
version = "0.8.0";
version = "0.9.0";
pname = "websockify";
src = fetchPypi {
inherit pname version;
sha256 = "547d3d98c5081f2dc2872a2e4a3aef33e0ee5141d5f6209204aab2f4a41548d2";
sha256 = "1nnalv0jkkj34hw6yb12lp6r6fj1ps9vkkyshjvx65y5xdwmnny3";
};
propagatedBuildInputs = [ numpy ];

View File

@@ -30,7 +30,6 @@ buildPythonPackage rec {
doCheck = true;
checkPhase = ''
${python.interpreter} python${pythonSuffix}/smoketest.py
${python.interpreter} python${pythonSuffix}/pythontest.py
'';

View File

@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "zstd";
version = "1.4.1.0";
version = "1.4.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "0laxg0pag1bzmqmg4x81jb32412pn98p9zg2b0li035m779nka95";
sha256 = "1h4wvzikar4ryhawm7clh29bvhbpy0ix1rlxhg9x195fpq56vsh7";
};
postPatch = ''