about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2018-11-28 20:46:33 -0500
committerGitHub <noreply@github.com>2018-11-28 20:46:33 -0500
commitf9714fdceab51386f516f707b2507f8d142feeb7 (patch)
treea8cef40baa8152d1918eac6f99afa2170172ba6b
parent41d8b21181efe642a69ff6f42645ed3edf950d46 (diff)
parent9d2160e73bcd96a12235e0d06731964032f136d4 (diff)
downloadnixlib-f9714fdceab51386f516f707b2507f8d142feeb7.tar
nixlib-f9714fdceab51386f516f707b2507f8d142feeb7.tar.gz
nixlib-f9714fdceab51386f516f707b2507f8d142feeb7.tar.bz2
nixlib-f9714fdceab51386f516f707b2507f8d142feeb7.tar.lz
nixlib-f9714fdceab51386f516f707b2507f8d142feeb7.tar.xz
nixlib-f9714fdceab51386f516f707b2507f8d142feeb7.tar.zst
nixlib-f9714fdceab51386f516f707b2507f8d142feeb7.zip
Merge pull request #50471 from Ma27/package-python-fs-s3-support
pythonPackages.fs-s3fs: init at 1.0.0
-rw-r--r--pkgs/development/python-modules/fs-s3fs/default.nix23
-rw-r--r--pkgs/development/python-modules/pyftpdlib/default.nix6
-rw-r--r--pkgs/top-level/python-packages.nix2
3 files changed, 28 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix
new file mode 100644
index 000000000000..156b0fdd76e9
--- /dev/null
+++ b/pkgs/development/python-modules/fs-s3fs/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage, fetchPypi, lib, fs, six, boto3 }:
+
+buildPythonPackage rec {
+  pname = "fs-s3fs";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1czv67zs4sl5l3rv9l3hzn22zzzqm372lq1wlhihigir4cfyslak";
+  };
+
+  propagatedBuildInputs = [ fs six boto3 ];
+
+  # tests try to integrate an s3 bucket which can't be tested properly in an isolated environment.
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://pypi.org/project/fs-s3fs/;
+    license = licenses.mit;
+    description = "Amazon S3 filesystem for PyFilesystem2";
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix
index b8f483d3a1dc..254edfb86937 100644
--- a/pkgs/development/python-modules/pyftpdlib/default.nix
+++ b/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -20,9 +20,9 @@ buildPythonPackage rec {
   checkInputs = [ mock psutil ];
   propagatedBuildInputs = [ pyopenssl pysendfile ];
 
-  checkPhase = ''
-    ${python.interpreter} pyftpdlib/test/runner.py
-  '';
+  # impure filesystem-related tests cause timeouts
+  # on Hydra: https://hydra.nixos.org/build/84374861
+  doCheck = false;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/giampaolo/pyftpdlib/;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e7cfc642955..f17e501e9ded 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2766,6 +2766,8 @@ in {
 
   fs = callPackage ../development/python-modules/fs { };
 
+  fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
+
   libcloud = callPackage ../development/python-modules/libcloud { };
 
   libgpuarray = callPackage ../development/python-modules/libgpuarray {