diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2019-08-04 09:56:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-04 09:56:46 -0500 |
commit | 876ed94c288b298834bdc28bba61f5b7672156f7 (patch) | |
tree | cb6907915aefe8b2620f953fd05fa94f122e3947 /pkgs | |
parent | 3bf5468d29e70c9b6e0636c642274a5030766a93 (diff) | |
parent | 73352188ba788e8cdba81c977e08360f257ccd6a (diff) |
Merge pull request #63480 from jonringer/bump_py_docker
pythonPackages.docker: 3.7.2 -> 4.0.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/docker/default.nix | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index fc6169f1b1368..d82cc0d3f6b84 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -1,33 +1,43 @@ -{ stdenv, buildPythonPackage, fetchPypi -, six, requests, websocket_client -, ipaddress, backports_ssl_match_hostname, docker_pycreds +{ stdenv, buildPythonPackage, fetchPypi, isPy27 +, backports_ssl_match_hostname +, mock +, paramiko +, pytest +, requests +, six +, websocket_client }: + buildPythonPackage rec { - version = "3.7.2"; + version = "4.0.2"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "c456ded5420af5860441219ff8e51cdec531d65f4a9e948ccd4133e063b72f50"; + sha256 = "0r1i46h8x1vfvadayyvmh5hc6mpzgv3vvp6pv4g1wavamya2wnyc"; }; propagatedBuildInputs = [ six requests websocket_client - ipaddress - backports_ssl_match_hostname - docker_pycreds + paramiko + ] ++ stdenv.lib.optional isPy27 backports_ssl_match_hostname; + + checkInputs = [ + mock + pytest ]; - # Flake8 version conflict - doCheck = false; + # Other tests touch network + checkPhase = '' + ${pytest}/bin/pytest tests/unit/ + ''; meta = with stdenv.lib; { description = "An API client for docker written in Python"; homepage = https://github.com/docker/docker-py; license = licenses.asl20; - maintainers = with maintainers; [ - ]; + maintainers = with maintainers; [ jonringer ]; }; } |