From 20d4ce6981af1ad90d4ea4aa4ff84d8aab12c814 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH] python3Packages.docker: 5.0.3 -> 6.0.0 --- .../python-modules/docker/default.nix | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index f70fcebb26f3..48f454a69b4f 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -2,39 +2,49 @@ , stdenv , buildPythonPackage , fetchPypi -, isPy27 -, backports_ssl_match_hostname -, mock +, pythonOlder +, packaging , paramiko , pytestCheckHook , requests -, six +, setuptools_scm +, urllib3 , websocket-client }: buildPythonPackage rec { pname = "docker"; - version = "5.0.3"; + version = "6.0.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d916a26b62970e7c2f554110ed6af04c7ccff8e9f81ad17d0d40c75637e227fb"; + sha256 = "sha256-GeMwRwr0AWfSk7A1JXjB+iLXSzTT7fXU/5DrwgO7svE="; }; - nativeBuildInputs = lib.optional isPy27 mock; + nativeBuildInputs = [ + setuptools_scm + ]; propagatedBuildInputs = [ - paramiko + packaging requests - six + urllib3 websocket-client - ] ++ lib.optional isPy27 backports_ssl_match_hostname; + ]; + + passthru.optional-dependencies.ssh = [ + paramiko + ]; checkInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ "tests/unit" ]; + pytestFlagsArray = [ + "tests/unit" + ]; # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket disabledTests = lib.optionals stdenv.isDarwin [ "api_test" "stream_response" "socket_file" ];