summary refs log tree commit diff
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-10-31 23:47:05 +0000
committerGitHub <noreply@github.com>2017-10-31 23:47:05 +0000
commitb51aa7b6d8b5d5ca207cdc6e3c515d26488de265 (patch)
tree237e4fc144d31a2034cfe88e097585e8b3da3598
parenteb88e597b1646c4239c725fa7cf70ff4e6da4ec5 (diff)
parentb400e36548aab5a5adc1021f85cdde0054b06904 (diff)
downloadnixlib-b51aa7b6d8b5d5ca207cdc6e3c515d26488de265.tar
nixlib-b51aa7b6d8b5d5ca207cdc6e3c515d26488de265.tar.gz
nixlib-b51aa7b6d8b5d5ca207cdc6e3c515d26488de265.tar.bz2
nixlib-b51aa7b6d8b5d5ca207cdc6e3c515d26488de265.tar.lz
nixlib-b51aa7b6d8b5d5ca207cdc6e3c515d26488de265.tar.xz
nixlib-b51aa7b6d8b5d5ca207cdc6e3c515d26488de265.tar.zst
nixlib-b51aa7b6d8b5d5ca207cdc6e3c515d26488de265.zip
Merge pull request #31061 from orivej/pip-tools
pip-tools: update tests for 1.9.0 -> 1.10.1
-rw-r--r--pkgs/development/python-modules/pip-tools/default.nix14
-rw-r--r--pkgs/top-level/python-packages.nix1
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 2c297d8d7193..d916f9b95b1d 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 b9c5fa93dfa5..0be1ff17ee01 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;
   };