Skip to content

Commit e576535

Browse files
FRidhFRidh
authoredJan 1, 2018
Merge pull request #33280 from NixOS/python-unstable
Python: upgrade package set
2 parents 1869e7e + b998bfa commit e576535

File tree

22 files changed

+286
-181
lines changed

22 files changed

+286
-181
lines changed
 

‎pkgs/development/python-modules/blaze/default.nix

+3-9
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525

2626
buildPythonPackage rec {
2727
pname = "blaze";
28-
version = "0.11.0";
29-
name = "${pname}-${version}";
28+
version = "0.11.3";
3029

3130
src = fetchurl {
3231
url = "https://github.com/blaze/blaze/archive/${version}.tar.gz";
33-
sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a";
32+
sha256 = "075gqc9d7g284z4nfwv5zbq99ln22w25l4lcndjg3v10kmsjadww";
3433
};
3534

3635
checkInputs = [ pytest ];
@@ -56,13 +55,8 @@ buildPythonPackage rec {
5655
toolz
5756
];
5857

59-
# Failing test
60-
# ERROR collecting blaze/tests/test_interactive.py
61-
# E networkx.exception.NetworkXNoPath: node <class 'list'> not
62-
# reachable from <class 'dask.array.core.Array'>
63-
doCheck = false;
64-
6558
checkPhase = ''
59+
rm pytest.ini # Not interested in coverage
6660
py.test blaze/tests
6761
'';
6862

‎pkgs/development/python-modules/brotlipy/default.nix

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{ lib
2+
, buildPythonPackage
3+
, fetchPypi
4+
, cffi
5+
, enum34
6+
, construct
7+
, pytest
8+
, hypothesis
9+
}:
10+
11+
buildPythonPackage rec {
12+
pname = "brotlipy";
13+
version = "0.7.0";
14+
15+
src = fetchPypi {
16+
inherit pname version;
17+
sha256 = "36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df";
18+
};
19+
20+
propagatedBuildInputs = [ cffi enum34 construct ];
21+
22+
checkInputs = [ pytest hypothesis ];
23+
24+
checkPhase = ''
25+
py.test
26+
'';
27+
28+
# Missing test files
29+
doCheck = false;
30+
31+
meta = {
32+
description = "Python bindings for the reference Brotli encoder/decoder";
33+
homepage = "https://github.com/python-hyper/brotlipy/";
34+
license = lib.licenses.mit;
35+
};
36+
}

‎pkgs/development/python-modules/decorator/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
buildPythonPackage rec {
77
pname = "decorator";
8-
version = "4.0.11";
8+
version = "4.1.2";
99

1010
src = fetchPypi {
1111
inherit pname version;
12-
sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76";
12+
sha256 = "7cb64d38cb8002971710c8899fbdfb859a23a364b7c99dab19d1f719c2ba16b5";
1313
};
1414

1515
meta = {

‎pkgs/development/python-modules/fastimport/default.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{ stdenv, buildPythonPackage, python, fetchurl }:
1+
{ stdenv, buildPythonPackage, python, fetchPypi}:
22

33
buildPythonPackage rec {
4-
name = "fastimport-${version}";
4+
pname = "fastimport";
55
version = "0.9.6";
66

7-
src = fetchurl {
8-
url = "mirror://pypi/f/fastimport/${name}.tar.gz";
7+
src = fetchPypi {
8+
inherit pname version;
99
sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43";
1010
};
1111

‎pkgs/development/python-modules/gflags/default.nix

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
buildPythonPackage rec {
44
version = "3.1.2";
5-
pname = "gflags";
6-
name = pname + "-" + version;
5+
pname = "python-gflags";
76

87
src = fetchPypi {
9-
inherit version;
10-
pname = "python-gflags";
8+
inherit pname version;
119
sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2";
1210
};
1311

14-
buildInputs = [ pytest ];
12+
checkInputs = [ pytest ];
1513

1614
propagatedBuildInputs = [ six ];
1715

‎pkgs/development/python-modules/jellyfish/default.nix

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{ lib
2+
, buildPythonPackage
3+
, fetchPypi
4+
, pytest
5+
, unicodecsv
6+
}:
7+
8+
buildPythonPackage rec {
9+
pname = "jellyfish";
10+
version = "0.5.6";
11+
12+
src = fetchPypi {
13+
inherit pname version;
14+
sha256 = "887a9a49d0caee913a883c3e7eb185f6260ebe2137562365be422d1316bd39c9";
15+
};
16+
17+
checkInputs = [ pytest unicodecsv ];
18+
19+
meta = {
20+
homepage = https://github.com/sunlightlabs/jellyfish;
21+
description = "Approximate and phonetic matching of strings";
22+
maintainers = with lib.maintainers; [ koral ];
23+
};
24+
}

‎pkgs/development/python-modules/mygpoclient/default.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ stdenv, fetchFromGitHub, buildPythonPackage, nose, minimock }:
22

33
buildPythonPackage rec {
4-
name = "mygpoclient-${version}";
4+
pname = "mypgoclient";
55
version = "1.8";
66

77
src = fetchFromGitHub {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
1111
sha256 = "0aa28wc55x3rxa7clwfv5v5500ffyaq0vkxaa3v01y1r93dxkdvp";
1212
};
1313

14-
buildInputs = [ nose minimock ];
14+
checkInputs = [ nose minimock ];
1515

1616
checkPhase = ''
1717
nosetests
@@ -25,7 +25,6 @@ buildPythonPackage rec {
2525
'';
2626
homepage = https://github.com/gpodder/mygpoclient;
2727
license = with licenses; [ gpl3 ];
28-
platforms = with platforms; linux ++ darwin;
2928
maintainers = with maintainers; [ skeidel ];
3029
};
3130
}

‎pkgs/development/python-modules/networkx/default.nix

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{ lib
2+
, buildPythonPackage
3+
, fetchPypi
4+
, nose
5+
, decorator
6+
, isPy36
7+
, isPyPy
8+
}:
9+
10+
buildPythonPackage rec {
11+
pname = "networkx";
12+
version = "1.11";
13+
14+
# Currently broken on PyPy.
15+
# https://github.com/networkx/networkx/pull/1361
16+
disabled = isPyPy;
17+
18+
src = fetchPypi {
19+
inherit pname version;
20+
sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd";
21+
};
22+
23+
checkInputs = [ nose ];
24+
propagatedBuildInputs = [ decorator ];
25+
26+
# 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299
27+
doCheck = !(isPy36);
28+
29+
meta = {
30+
homepage = "https://networkx.github.io/";
31+
description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks";
32+
license = lib.licenses.bsd3;
33+
};
34+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ let
2828
inherit (stdenv) isDarwin;
2929
in buildPythonPackage rec {
3030
pname = "pandas";
31-
version = "0.21.1";
31+
version = "0.22.0";
3232
name = "${pname}-${version}";
3333

3434
src = fetchPypi {
3535
inherit pname version;
36-
sha256 = "c5f5cba88bf0659554c41c909e1f78139f6fce8fa9315a29a23692b38ff9788a";
36+
sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c";
3737
};
3838

3939
LC_ALL = "en_US.UTF-8";

‎pkgs/development/python-modules/parse-type/default.nix

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
, pytest, pytestrunner
44
, parse, six, enum34
55
}:
6+
67
buildPythonPackage rec {
7-
pname = "parse-type";
8+
pname = "parse_type";
89
version = "0.3.4";
9-
name = "${pname}-${version}";
1010

1111
src = fetchPypi {
12-
inherit version;
13-
pname = "parse_type";
12+
inherit pname version;
1413
sha256 = "3dd0b323bafcb8c25e000ce5589042a1c99cba9c3bec77b9f591e46bc9606147";
1514
};
1615

‎pkgs/development/python-modules/partd/default.nix

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{ lib
2+
, buildPythonPackage
3+
, fetchPypi
4+
, pytest
5+
, locket
6+
, numpy
7+
, pandas
8+
, pyzmq
9+
, toolz
10+
}:
11+
12+
buildPythonPackage rec {
13+
pname = "partd";
14+
version = "0.3.8";
15+
16+
src = fetchPypi {
17+
inherit pname version;
18+
sha256 = "67291f1c4827cde3e0148b3be5d69af64b6d6169feb9ba88f0a6cfe77089400f";
19+
};
20+
21+
checkInputs = [ pytest ];
22+
23+
propagatedBuildInputs = [ locket numpy pandas pyzmq toolz ];
24+
25+
checkPhase = ''
26+
rm partd/tests/test_zmq.py # requires network & fails
27+
py.test
28+
'';
29+
30+
meta = {
31+
description = "Appendable key-value storage";
32+
license = with lib.licenses; [ bsd3 ];
33+
homepage = https://github.com/dask/partd/;
34+
};
35+
}

‎pkgs/development/python-modules/plone-testing/default.nix

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{ lib
2+
, buildPythonPackage
3+
, fetchPypi
4+
, zope_testing
5+
, setuptools
6+
}:
7+
8+
buildPythonPackage rec {
9+
pname = "plone.testing";
10+
version = "5.1.1";
11+
12+
src = fetchPypi {
13+
inherit pname version;
14+
sha256 = "2ca558a910b93355b760535b233518be3a06c58e46160487bf802b6f7cb1e511";
15+
};
16+
17+
propagatedBuildInputs = [ setuptools zope_testing ];
18+
19+
# Huge amount of testing dependencies (including Zope2)
20+
doCheck = false;
21+
22+
meta = {
23+
description = "Testing infrastructure for Zope and Plone projects";
24+
homepage = https://github.com/plone/plone.testing;
25+
license = lib.licenses.bsd3;
26+
};
27+
}

‎pkgs/development/python-modules/pycangjie/default.nix

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
{ stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie
2-
, sqlite, python, cython
2+
, sqlite, buildPythonPackage, cython
33
}:
44

5-
stdenv.mkDerivation rec {
6-
name = "${python.libPrefix}-pycangjie-${version}";
7-
version = "1.3_rev_${rev}";
5+
let
86
rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";
7+
in buildPythonPackage rec {
8+
pname = "pycangjie";
9+
version = "1.3_rev_${rev}";
10+
format = "other";
911

1012
src = fetchurl {
11-
name = "${name}.tar.gz";
1213
url = "https://github.com/Cangjians/pycangjie/archive/${rev}.tar.gz";
1314
sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05";
1415
};
1516

1617
nativeBuildInputs = [ pkgconfig ];
1718
buildInputs = [
18-
autoconf automake libtool libcangjie sqlite python cython
19+
autoconf automake libtool libcangjie sqlite cython
1920
];
2021

2122
preConfigure = ''

‎pkgs/development/python-modules/pysc2/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
}:
1919

2020
buildPythonPackage rec {
21+
pname = "PySC2";
2122
version = "1.2";
22-
name = "PySC2-${version}";
2323

2424
src = fetchFromGitHub {
2525
owner = "deepmind";

‎pkgs/development/python-modules/python-fuse/default.nix

+14-14
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
}:
88

99
buildPythonPackage rec {
10-
baseName = "fuse";
11-
version = "0.2.1";
12-
name = "${baseName}-${version}";
13-
disabled = isPy3k;
10+
pname = "fuse";
11+
version = "0.2.1";
1412

15-
src = fetchurl {
16-
url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
17-
sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
18-
};
13+
disabled = isPy3k;
1914

20-
nativeBuildInputs = [ pkgconfig ];
21-
buildInputs = [ fuse ];
15+
src = fetchurl {
16+
url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
17+
sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
18+
};
2219

23-
meta = {
24-
description = "Python bindings for FUSE";
25-
license = lib.licenses.lgpl21;
26-
};
20+
nativeBuildInputs = [ pkgconfig ];
21+
buildInputs = [ fuse ];
22+
23+
meta = {
24+
description = "Python bindings for FUSE";
25+
license = lib.licenses.lgpl21;
26+
};
2727
}

‎pkgs/development/python-modules/pywbem/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
}:
55

66
buildPythonPackage rec {
7-
name = "pywbem-${version}";
7+
pname = "pywbem";
88
version = "0.10.0";
99

1010
src = fetchFromGitHub {

0 commit comments

Comments
 (0)
Please sign in to comment.