From 64e5e56382b9f4d9b2b4042cedb594deaed053e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Sep 2021 15:24:50 +0200 Subject: [PATCH 1/9] python3Packages.fsspec: 2021.07.0 -> 2021.08.1 --- pkgs/development/python-modules/fsspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 7b9315c8f8fd..befcde0c2838 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2021.07.0"; + version = "2021.08.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - hash = "sha256-I0oR7qxMCB2egyOx69hY0++H7fzCdK3ZyyzCvP3yXAs="; + sha256 = "0xxzcp69div1sy975x82k754snbsksyqr73h6jiasdxj8wka49s0"; }; propagatedBuildInputs = [ From b16b2c842f5c8d364faf2b19b4c2347b853b76bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 17 Sep 2021 14:20:21 +0200 Subject: [PATCH 2/9] python3Packages.s3fs: 2021.7.0 -> 2021.8.1 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 882f9e90e3f2..645a0b3566f9 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2021.7.0"; + version = "2021.8.1"; src = fetchPypi { inherit pname version; - hash = "sha256-KTKU7I7QhgVhfbRA46UCKaQT3Bbc8yyUj66MvZsCrpY="; + sha256 = "0zwy2fr95s5wzrr2iwbayjh9xh421p6wf0m75szl7rw930v1kb2y"; }; buildInputs = [ From 5f18927d847f517aabcf51c73917cee304f1d6a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 17 Sep 2021 15:58:23 +0200 Subject: [PATCH 3/9] python3Packages.dask: 2021.08.1 -> 2021.09.0 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 120c98febce2..7850861486c3 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2021.08.1"; + version = "2021.09.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-HnrHOp3Y/iLYaK3KVp6NJrK68BMqX8lTl/wLosiGc7k="; + sha256 = "sha256-Gb6eQ5Hebx3mBNGvgB5yvM4dPsIxJl9ka++yYC/Zf7Q="; }; propagatedBuildInputs = [ From 0801a2b1d6d4584fd4fb10d0a2adfbc11a482284 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 17 Sep 2021 16:04:31 +0200 Subject: [PATCH 4/9] python3Packages.distributed: 2021.8.1 -> 2021.9.0 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 38c977f3ffa5..777d6d7d7400 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.8.1"; + version = "2021.9.0"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "c13ac10ecd9ee5f0ff67f5697149062d6e483f23a079918df1ab2e19b11fa77d"; + sha256 = "sha256-IiKc0rJYODCtGC9AAOkjbww/VG7PdfrqJ32IHU9xWbo="; }; propagatedBuildInputs = [ From b593c8b19c0a237202981ef977f65ff4f082e06f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Sep 2021 11:54:51 +0200 Subject: [PATCH 5/9] python3Packages.gcsfs: 2021.07.0 -> 2021.08.1 --- pkgs/development/python-modules/gcsfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index db063747e8b1..65e18513185a 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2021.07.0"; + version = "2021.08.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-nC/uyhKKam3W+cOOTBULPeG6Hy2bExWYNOfDs1cPt1Y="; + sha256 = "sha256-SPQcSdEEbU791oqkvuwmvyvQ6HglvoWKMi5SdnRcEZI="; }; propagatedBuildInputs = [ From ef307af08ec1d13692dfefd7616bba878bb67301 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Sep 2021 16:50:39 +0200 Subject: [PATCH 6/9] python3Packages.thriftpy2: init at 0.4.14 --- .../python-modules/thriftpy2/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/thriftpy2/default.nix diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix new file mode 100644 index 000000000000..0d5f5afe4a5c --- /dev/null +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, pythonOlder +, ply +, six +, tornado +}: + +buildPythonPackage rec { + pname = "thriftpy2"; + version = "0.4.14"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Thriftpy"; + repo = pname; + rev = "v${version}"; + sha256 = "17f57vsbym4c9yax128bhrwg2zjxcsgl3ja6422y8hyb38v5mdc3"; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + ply + six + tornado + ]; + + # Not all needed files seems to be present + doCheck = false; + + pythonImportsCheck = [ "thriftpy2" ]; + + meta = with lib; { + description = "Python module for Apache Thrift"; + homepage = "https://github.com/Thriftpy/thriftpy2"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c005de4611b..19352cde22dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8897,6 +8897,8 @@ in { thrift = callPackage ../development/python-modules/thrift { }; + thriftpy2 = callPackage ../development/python-modules/thriftpy2 { }; + thumborPexif = callPackage ../development/python-modules/thumborpexif { }; tkinter = let From ff34dbb4fa08488edc5c563f39bdb49e58b4e464 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Sep 2021 17:00:34 +0200 Subject: [PATCH 7/9] python3Packages.parquet: init at 1.3.1 --- .../python-modules/parquet/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/parquet/default.nix diff --git a/pkgs/development/python-modules/parquet/default.nix b/pkgs/development/python-modules/parquet/default.nix new file mode 100644 index 000000000000..ceaba917e832 --- /dev/null +++ b/pkgs/development/python-modules/parquet/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, python-snappy +, pythonOlder +, thriftpy2 +}: + +buildPythonPackage rec { + pname = "parquet"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "jcrobak"; + repo = "parquet-python"; + rev = "v${version}"; + sha256 = "1ahvg4dz9fzi4vdm9jmslq3v3jahjj17fdcc5fljgcw6h9yxyl2r"; + }; + + propagatedBuildInputs = [ + python-snappy + thriftpy2 + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Fails with AttributeError + "test_bson" + "testFromExample" + ]; + + pythonImportsCheck = [ "thriftpy2" ]; + + meta = with lib; { + description = "Python implementation of the parquet columnar file format"; + homepage = "https://github.com/jcrobak/parquet-python"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19352cde22dc..f3834b61c382 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5265,6 +5265,8 @@ in { parfive = callPackage ../development/python-modules/parfive { }; + parquet = callPackage ../development/python-modules/parquet { }; + parse = callPackage ../development/python-modules/parse { }; parsedatetime = callPackage ../development/python-modules/parsedatetime { }; From d49ca24857d8656c1c9fd4c5d581962db1a7aab4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Sep 2021 18:10:02 +0200 Subject: [PATCH 8/9] python3Packages.intake-parquet: init at 0.2.3 --- .../python-modules/intake-parquet/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/intake-parquet/default.nix diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix new file mode 100644 index 000000000000..49d5e1ed4b93 --- /dev/null +++ b/pkgs/development/python-modules/intake-parquet/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pandas +, dask +, fastparquet +, pyarrow +}: + +buildPythonPackage rec { + pname = "intake-parquet"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "intake"; + repo = pname; + rev = version; + sha256 = "037jd3qkk6dybssp570kzvaln2c6pk2avd2b5mll42gaxdxxnp02"; + }; + + propagatedBuildInputs = [ + pandas + dask + fastparquet + pyarrow + ]; + + postPatch = '' + # Break circular dependency + substituteInPlace requirements.txt \ + --replace "intake" "" + ''; + + doCheck = false; + + #pythonImportsCheck = [ "intake_parquet" ]; + + meta = with lib; { + description = "Parquet plugin for Intake"; + homepage = "https://github.com/intake/intake-parquet"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3834b61c382..09b34599d071 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3644,6 +3644,8 @@ in { intake = callPackage ../development/python-modules/intake { }; + intake-parquet = callPackage ../development/python-modules/intake-parquet { }; + intbitset = callPackage ../development/python-modules/intbitset { }; intelhex = callPackage ../development/python-modules/intelhex { }; From 99df1a5852e70370c03e2957d82e8e19604fbc6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Sep 2021 11:15:09 +0200 Subject: [PATCH 9/9] python3Packages.intake: fix build --- .../python-modules/intake/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 3a959b897216..361469f540e1 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -5,12 +5,14 @@ , dask , holoviews , hvplot +, fsspec , jinja2 , msgpack , msgpack-numpy , numpy , pandas , panel +, intake-parquet , pyarrow , pytestCheckHook , pythonOlder @@ -24,6 +26,7 @@ buildPythonPackage rec { pname = "intake"; version = "0.6.3"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -49,7 +52,12 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ pyarrow pytestCheckHook ]; + checkInputs = [ + fsspec + intake-parquet + pyarrow + pytestCheckHook + ]; postPatch = '' # Is in setup_requires but not used in setup.py... @@ -64,14 +72,12 @@ buildPythonPackage rec { ''; disabledTests = [ - # disable tests which touch network + # disable tests which touch network and are broken "test_discover" "test_filtered_compressed_cache" "test_get_dir" "test_remote_cat" "http" - - # broken test "test_read_pattern" "test_remote_arr" ]; @@ -80,6 +86,6 @@ buildPythonPackage rec { description = "Data load and catalog system"; homepage = "https://github.com/ContinuumIO/intake"; license = licenses.bsd2; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; }