about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/gcsfs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-06-22 15:01:47 +0000
committerAlyssa Ross <hi@alyssa.is>2021-06-22 16:57:59 +0000
commit633cab0ecb07627706c6b523e219490f019eaab5 (patch)
tree4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/python-modules/gcsfs
parentffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff)
parent432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff)
downloadnixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar
nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz
nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2
nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz
nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz
nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst
nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts:
#	nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
#	nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
#	nixpkgs/pkgs/applications/window-managers/sway/default.nix
#	nixpkgs/pkgs/build-support/rust/default.nix
#	nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/gcsfs')
-rw-r--r--nixpkgs/pkgs/development/python-modules/gcsfs/default.nix45
1 files changed, 34 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix b/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix
index 483e4a61084e..c71794b106eb 100644
--- a/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix
@@ -1,31 +1,54 @@
-{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, google-auth
-, google-auth-oauthlib, requests, decorator, fsspec, ujson, aiohttp, crcmod
-, pytest-vcr, vcrpy }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, google-auth
+, google-auth-oauthlib
+, requests
+, decorator
+, fsspec
+, ujson
+, aiohttp
+, crcmod
+, pytest-vcr
+, vcrpy
+}:
 
 buildPythonPackage rec {
   pname = "gcsfs";
-  version = "2021.04.0";
+  version = "2021.05.0";
+  disabled = pythonOlder "3.6";
 
-  # github sources needed for test data
   src = fetchFromGitHub {
     owner = "dask";
     repo = pname;
     rev = version;
-    sha256 = "sha256-OA43DaQue7R5d6SzfKThEQFEwJndjLfznu1LMubs5fs=";
+    sha256 = "sha256-I17eWaijxn0+8CzfzvzXVc0t9gQ03vx29a/i+QCQ0/U=";
   };
 
   propagatedBuildInputs = [
+    aiohttp
+    crcmod
+    decorator
+    fsspec
     google-auth
     google-auth-oauthlib
     requests
-    decorator
-    fsspec
-    aiohttp
     ujson
-    crcmod
   ];
 
-  checkInputs = [ pytestCheckHook pytest-vcr vcrpy ];
+  checkInputs = [
+    pytest-vcr
+    pytestCheckHook
+    vcrpy
+  ];
+
+  disabledTests = [
+    # Tests wants to communicate with the Link-local address
+    "test_GoogleCredentials_None"
+  ];
+
   pythonImportsCheck = [ "gcsfs" ];
 
   meta = with lib; {