diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/development/python-modules/intake | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/intake')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/intake/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/intake/default.nix b/nixpkgs/pkgs/development/python-modules/intake/default.nix index fff6d74b56a1..361469f540e1 100644 --- a/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/nixpkgs/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 @@ -23,12 +25,13 @@ buildPythonPackage rec { pname = "intake"; - version = "0.6.2"; + version = "0.6.3"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b0cab1d185a703acb38eecb9cff3edd5cc7004fe18a36d5e42a8f7fffc9cca1c"; + sha256 = "f64543353f30d9440b953984f78b7a0954e5756d70c64243609d307ba488014f"; }; propagatedBuildInputs = [ @@ -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 ]; }; } |