From b400e36548aab5a5adc1021f85cdde0054b06904 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 31 Oct 2017 21:23:58 +0000 Subject: [PATCH] pip-tools: update tests for 1.9.0 -> 1.10.1 --- .../python-modules/pip-tools/default.nix | 14 ++++++++++---- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 2c297d8d719..d916f9b95b1 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first -, setuptools_scm, glibcLocales, mock }: +, setuptools_scm, git, glibcLocales, mock }: buildPythonPackage rec { pname = "pip-tools"; @@ -12,12 +12,18 @@ buildPythonPackage rec { }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ pytest glibcLocales mock ]; + checkInputs = [ pytest git glibcLocales mock ]; propagatedBuildInputs = [ pip click six first setuptools_scm ]; checkPhase = '' - export HOME=$(mktemp -d) - py.test -k "not test_realistic_complex_sub_dependencies" # requires network + export HOME=$(mktemp -d) VIRTUAL_ENV=1 + tests_without_network_access=" + not test_realistic_complex_sub_dependencies \ + and not test_editable_package_vcs \ + and not test_generate_hashes_all_platforms \ + and not test_generate_hashes_without_interfering_with_each_other \ + " + py.test -k "$tests_without_network_access" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9c5fa93dfa..0be1ff17ee0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15114,6 +15114,7 @@ in { }; pip-tools = callPackage ../development/python-modules/pip-tools { + git = pkgs.gitMinimal; glibcLocales = pkgs.glibcLocales; };