8a9595c · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge pull request #137276 from fabaff/bump-gcsfs

python3Packages.fsspec: 2021.07.0 -> 2021.08.1, python3Packages.gcsfs: 2021.07.0 -> 2021.08.1

commit8a9595cfc03e00c1b4883cb001c9ee63a18edc1e authorFabian Affolter <fabian@affolter-engineering.ch> dateWed 22 Sep 2021, 10:32 (5 years ago) parent6a76b84 99df1a5

10 files changed+161−15

compare with master

unifiedsplit

pkgs/development/python-modules/dask/default.nix+2−2

@@ -22,7 +22,7 @@

2222

2323buildPythonPackage rec {

2424 pname = "dask";

25− version = "2021.08.1";

25+ version = "2021.09.0";

2626 format = "setuptools";

2727

2828 disabled = pythonOlder "3.7";

@@ -31,7 +31,7 @@ buildPythonPackage rec {

3131 owner = "dask";

3232 repo = pname;

3333 rev = version;

34− sha256 = "sha256-HnrHOp3Y/iLYaK3KVp6NJrK68BMqX8lTl/wLosiGc7k=";

34+ sha256 = "sha256-Gb6eQ5Hebx3mBNGvgB5yvM4dPsIxJl9ka++yYC/Zf7Q=";

3535 };

3636

3737 propagatedBuildInputs = [

pkgs/development/python-modules/distributed/default.nix+2−2

@@ -19,13 +19,13 @@

1919

2020buildPythonPackage rec {

2121 pname = "distributed";

22− version = "2021.8.1";

22+ version = "2021.9.0";

2323 disabled = pythonOlder "3.6";

2424

2525 # get full repository need conftest.py to run tests

2626 src = fetchPypi {

2727 inherit pname version;

28− sha256 = "c13ac10ecd9ee5f0ff67f5697149062d6e483f23a079918df1ab2e19b11fa77d";

28+ sha256 = "sha256-IiKc0rJYODCtGC9AAOkjbww/VG7PdfrqJ32IHU9xWbo=";

2929 };

3030

3131 propagatedBuildInputs = [

pkgs/development/python-modules/fsspec/default.nix+2−2

@@ -14,14 +14,14 @@

1414

1515buildPythonPackage rec {

1616 pname = "fsspec";

17− version = "2021.07.0";

17+ version = "2021.08.1";

1818 disabled = pythonOlder "3.6";

1919

2020 src = fetchFromGitHub {

2121 owner = "intake";

2222 repo = "filesystem_spec";

2323 rev = version;

24− hash = "sha256-I0oR7qxMCB2egyOx69hY0++H7fzCdK3ZyyzCvP3yXAs=";

24+ sha256 = "0xxzcp69div1sy975x82k754snbsksyqr73h6jiasdxj8wka49s0";

2525 };

2626

2727 propagatedBuildInputs = [

pkgs/development/python-modules/gcsfs/default.nix+2−2

@@ -17,14 +17,14 @@

1717

1818buildPythonPackage rec {

1919 pname = "gcsfs";

20− version = "2021.07.0";

20+ version = "2021.08.1";

2121 disabled = pythonOlder "3.6";

2222

2323 src = fetchFromGitHub {

2424 owner = "dask";

2525 repo = pname;

2626 rev = version;

27− sha256 = "sha256-nC/uyhKKam3W+cOOTBULPeG6Hy2bExWYNOfDs1cPt1Y=";

27+ sha256 = "sha256-SPQcSdEEbU791oqkvuwmvyvQ6HglvoWKMi5SdnRcEZI=";

2828 };

2929

3030 propagatedBuildInputs = [

pkgs/development/python-modules/intake-parquet/default.nixnew file+45

@@ -0,0 +1,45 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, pythonOlder

5+, pandas

6+, dask

7+, fastparquet

8+, pyarrow

9+}:

10+

11+buildPythonPackage rec {

12+ pname = "intake-parquet";

13+ version = "0.2.3";

14+

15+ src = fetchFromGitHub {

16+ owner = "intake";

17+ repo = pname;

18+ rev = version;

19+ sha256 = "037jd3qkk6dybssp570kzvaln2c6pk2avd2b5mll42gaxdxxnp02";

20+ };

21+

22+ propagatedBuildInputs = [

23+ pandas

24+ dask

25+ fastparquet

26+ pyarrow

27+ ];

28+

29+ postPatch = ''

30+ # Break circular dependency

31+ substituteInPlace requirements.txt \

32+ --replace "intake" ""

33+ '';

34+

35+ doCheck = false;

36+

37+ #pythonImportsCheck = [ "intake_parquet" ];

38+

39+ meta = with lib; {

40+ description = "Parquet plugin for Intake";

41+ homepage = "https://github.com/intake/intake-parquet";

42+ license = licenses.bsd2;

43+ maintainers = with maintainers; [ fab ];

44+ };

45+}

pkgs/development/python-modules/intake/default.nix+11−5

@@ -5,12 +5,14 @@

55, dask

66, holoviews

77, hvplot

8+, fsspec

89, jinja2

910, msgpack

1011, msgpack-numpy

1112, numpy

1213, pandas

1314, panel

15+, intake-parquet

1416, pyarrow

1517, pytestCheckHook

1618, pythonOlder

@@ -24,6 +26,7 @@

2426buildPythonPackage rec {

2527 pname = "intake";

2628 version = "0.6.3";

29+

2730 disabled = pythonOlder "3.6";

2831

2932 src = fetchPypi {

@@ -49,7 +52,12 @@ buildPythonPackage rec {

4952 tornado

5053 ];

5154

52− checkInputs = [ pyarrow pytestCheckHook ];

55+ checkInputs = [

56+ fsspec

57+ intake-parquet

58+ pyarrow

59+ pytestCheckHook

60+ ];

5361

5462 postPatch = ''

5563 # Is in setup_requires but not used in setup.py...

@@ -64,14 +72,12 @@ buildPythonPackage rec {

6472 '';

6573

6674 disabledTests = [

67− # disable tests which touch network

75+ # disable tests which touch network and are broken

6876 "test_discover"

6977 "test_filtered_compressed_cache"

7078 "test_get_dir"

7179 "test_remote_cat"

7280 "http"

73−

74− # broken test

7581 "test_read_pattern"

7682 "test_remote_arr"

7783 ];

@@ -80,6 +86,6 @@ buildPythonPackage rec {

8086 description = "Data load and catalog system";

8187 homepage = "https://github.com/ContinuumIO/intake";

8288 license = licenses.bsd2;

83− maintainers = [ maintainers.costrouc ];

89+ maintainers = with maintainers; [ costrouc ];

8490 };

8591}

pkgs/development/python-modules/parquet/default.nixnew file+44

@@ -0,0 +1,44 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, pytestCheckHook

5+, python-snappy

6+, pythonOlder

7+, thriftpy2

8+}:

10+buildPythonPackage rec {

11+ pname = "parquet";

12+ version = "1.3.1";

13+

14+ src = fetchFromGitHub {

15+ owner = "jcrobak";

16+ repo = "parquet-python";

17+ rev = "v${version}";

18+ sha256 = "1ahvg4dz9fzi4vdm9jmslq3v3jahjj17fdcc5fljgcw6h9yxyl2r";

19+ };

20+

21+ propagatedBuildInputs = [

22+ python-snappy

23+ thriftpy2

24+ ];

25+

26+ checkInputs = [

27+ pytestCheckHook

28+ ];

29+

30+ disabledTests = [

31+ # Fails with AttributeError

32+ "test_bson"

33+ "testFromExample"

34+ ];

35+

36+ pythonImportsCheck = [ "thriftpy2" ];

37+

38+ meta = with lib; {

39+ description = "Python implementation of the parquet columnar file format";

40+ homepage = "https://github.com/jcrobak/parquet-python";

41+ license = licenses.bsd2;

42+ maintainers = with maintainers; [ fab ];

43+ };

44+}

pkgs/development/python-modules/s3fs/default.nix+2−2

@@ -8,11 +8,11 @@

99buildPythonPackage rec {

1010 pname = "s3fs";

11− version = "2021.7.0";

11+ version = "2021.8.1";

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− hash = "sha256-KTKU7I7QhgVhfbRA46UCKaQT3Bbc8yyUj66MvZsCrpY=";

15+ sha256 = "0zwy2fr95s5wzrr2iwbayjh9xh421p6wf0m75szl7rw930v1kb2y";

1616 };

1717

1818 buildInputs = [

pkgs/development/python-modules/thriftpy2/default.nixnew file+45

@@ -0,0 +1,45 @@

1+{ lib

2+, buildPythonPackage

3+, cython

4+, fetchFromGitHub

5+, pythonOlder

6+, ply

7+, six

8+, tornado

9+}:

10+

11+buildPythonPackage rec {

12+ pname = "thriftpy2";

13+ version = "0.4.14";

14+

15+ disabled = pythonOlder "3.6";

16+

17+ src = fetchFromGitHub {

18+ owner = "Thriftpy";

19+ repo = pname;

20+ rev = "v${version}";

21+ sha256 = "17f57vsbym4c9yax128bhrwg2zjxcsgl3ja6422y8hyb38v5mdc3";

22+ };

23+

24+ nativeBuildInputs = [

25+ cython

26+ ];

27+

28+ propagatedBuildInputs = [

29+ ply

30+ six

31+ tornado

32+ ];

33+

34+ # Not all needed files seems to be present

35+ doCheck = false;

36+

37+ pythonImportsCheck = [ "thriftpy2" ];

38+

39+ meta = with lib; {

40+ description = "Python module for Apache Thrift";

41+ homepage = "https://github.com/Thriftpy/thriftpy2";

42+ license = licenses.mit;

43+ maintainers = with maintainers; [ fab ];

44+ };

45+}

pkgs/top-level/python-packages.nix+6

@@ -3646,6 +3646,8 @@ in {

36463646

36473647 intake = callPackage ../development/python-modules/intake { };

36483648

3649+ intake-parquet = callPackage ../development/python-modules/intake-parquet { };

3650+

36493651 intbitset = callPackage ../development/python-modules/intbitset { };

36503652

36513653 intelhex = callPackage ../development/python-modules/intelhex { };

@@ -5275,6 +5277,8 @@ in {

52755277

52765278 parfive = callPackage ../development/python-modules/parfive { };

52775279

5280+ parquet = callPackage ../development/python-modules/parquet { };

5281+

52785282 parse = callPackage ../development/python-modules/parse { };

52795283

52805284 parsedatetime = callPackage ../development/python-modules/parsedatetime { };

@@ -8925,6 +8929,8 @@ in {

89258929

89268930 thrift = callPackage ../development/python-modules/thrift { };

89278931

8932+ thriftpy2 = callPackage ../development/python-modules/thriftpy2 { };

8933+

89288934 thumborPexif = callPackage ../development/python-modules/thumborpexif { };

89298935

89308936 tkinter = let