From 9a4efdeaaee2a3d043cb8052d4447a789cf04daf Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 30 Apr 2023 14:38:18 +0800 Subject: [PATCH 1/2] python3Packages.s3transfer: remove unused inputs, fix cross compilation --- .../python-modules/s3transfer/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index acd739d854e9..40439b4d395f 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -1,13 +1,10 @@ { lib , botocore , buildPythonPackage -, docutils , fetchFromGitHub -, mock , pytestCheckHook , pythonOlder , stdenv -, wheel }: buildPythonPackage rec { @@ -26,16 +23,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ botocore ]; - buildInputs = [ docutils mock pytestCheckHook wheel ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Requires network access - "tests/integration/test_copy.py" - "tests/integration/test_delete.py" - "tests/integration/test_download.py" - "tests/integration/test_processpool.py" - "tests/integration/test_s3transfer.py" - "tests/integration/test_upload.py" + "tests/integration" ] ++ # There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS # See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603. From 040b2296e2611bf3b491cdc9142f3ef1efbb3890 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 30 Apr 2023 14:39:29 +0800 Subject: [PATCH 2/2] python3Packages.s3transfer: add nickcao to maintainers --- pkgs/development/python-modules/s3transfer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 40439b4d395f..facfde77b600 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Library for managing Amazon S3 transfers"; homepage = "https://github.com/boto/s3transfer"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; }