Merge pull request #120173 from nbren12/gcsfs

This commit is contained in:
Sandro 2021-04-24 03:53:34 +02:00 committed by GitHub
commit 01ad91b02c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 11 deletions

View file

@ -6977,6 +6977,12 @@
githubId = 818502; githubId = 818502;
name = "Nathan Yong"; name = "Nathan Yong";
}; };
nbren12 = {
email = "nbren12@gmail.com";
github = "nbren12";
githubId = 1386642;
name = "Noah Brenowitz";
};
nckx = { nckx = {
email = "github@tobias.gr"; email = "github@tobias.gr";
github = "nckx"; github = "nckx";

View file

@ -5,34 +5,36 @@
, pytestCheckHook , pytestCheckHook
, numpy , numpy
, stdenv , stdenv
, aiohttp
, pytest-vcr
, requests
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "fsspec"; pname = "fsspec";
version = "0.8.3"; version = "2021.04.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intake"; owner = "intake";
repo = "filesystem_spec"; repo = "filesystem_spec";
rev = version; rev = version;
sha256 = "0mfy0wxjfwwnp5q2afhhfbampf0fk71wsv512pi9yvrkzzfi1hga"; sha256 = "sha256-9072kb1VEQ0xg9hB8yEzJMD2Ttd3UGjBmTuhE+Uya1k=";
}; };
checkInputs = [ checkInputs = [ pytestCheckHook numpy pytest-vcr ];
pytestCheckHook
numpy __darwinAllowLocalNetworking = true;
];
propagatedBuildInputs = [ aiohttp requests ];
disabledTests = [ disabledTests = [
# Test assumes user name is part of $HOME # Test assumes user name is part of $HOME
# AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar' # AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar'
"test_strip_protocol_expanduser" "test_strip_protocol_expanduser"
# flaky: works locally but fails on hydra # test accesses this remote ftp server:
# as it uses the install dir for tests instead of a temp dir # https://ftp.fau.de/debian-cd/current/amd64/log/success
# resolved in https://github.com/intake/filesystem_spec/issues/432 and "test_find"
# can be enabled again from version 0.8.4
"test_pathobject"
] ++ lib.optionals (stdenv.isDarwin) [ ] ++ lib.optionals (stdenv.isDarwin) [
# works locally on APFS, fails on hydra with AssertionError comparing timestamps # works locally on APFS, fails on hydra with AssertionError comparing timestamps
# darwin hydra builder uses HFS+ and has only one second timestamp resolution # darwin hydra builder uses HFS+ and has only one second timestamp resolution

View file

@ -0,0 +1,37 @@
{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, google-auth
, google-auth-oauthlib, requests, decorator, fsspec, ujson, aiohttp, crcmod
, pytest-vcr, vcrpy }:
buildPythonPackage rec {
pname = "gcsfs";
version = "2021.04.0";
# github sources needed for test data
src = fetchFromGitHub {
owner = "dask";
repo = pname;
rev = version;
sha256 = "sha256-OA43DaQue7R5d6SzfKThEQFEwJndjLfznu1LMubs5fs=";
};
propagatedBuildInputs = [
google-auth
google-auth-oauthlib
requests
decorator
fsspec
aiohttp
ujson
crcmod
];
checkInputs = [ pytestCheckHook pytest-vcr vcrpy ];
pythonImportsCheck = [ "gcsfs" ];
meta = with lib; {
description = "Convenient Filesystem interface over GCS";
homepage = "https://github.com/dask/gcsfs";
license = licenses.bsd3;
maintainers = [ maintainers.nbren12 ];
};
}

View file

@ -2696,6 +2696,8 @@ in {
gcovr = callPackage ../development/python-modules/gcovr { }; gcovr = callPackage ../development/python-modules/gcovr { };
gcsfs = callPackage ../development/python-modules/gcsfs { };
gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; }); gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; });
gdata = callPackage ../development/python-modules/gdata { }; gdata = callPackage ../development/python-modules/gdata { };