From c397682663b586529838794c87ce0293cff8eda4 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Sat, 8 May 2021 01:13:59 +0300 Subject: [PATCH] python3Packages.pip-tools: 6.0.1 -> 6.1.0 --- .../python-modules/pip-tools/default.nix | 51 ++++++++----------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 48f15181ce0..51da889621f 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,45 +1,36 @@ -{ lib, fetchPypi, buildPythonPackage, pip, pytest, click, six -, setuptools_scm, git, glibcLocales, mock }: +{ lib +, fetchPypi +, pythonOlder +, buildPythonPackage +, pip +, pytest +, pytest-xdist +, click +, setuptools-scm +, git +, glibcLocales +, mock +, pep517 +}: buildPythonPackage rec { pname = "pip-tools"; - version = "6.0.1"; + version = "6.1.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3b0c7b95e8d3dfb011bb42cb38f356fcf5d0630480462b59c4d0a112b8d90281"; + sha256 = "sha256-QAv3finMpIwxq8IQBCkyu1LcwTjvTqTVLF20KaqK5u4="; }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ pytest git glibcLocales mock ]; - propagatedBuildInputs = [ pip click six setuptools_scm ]; - - disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) [ - # Depend on network tests: - "test_allow_unsafe_option" #paramaterized, but all fail - "test_annotate_option" #paramaterized, but all fail - "test_editable_package_vcs" - "test_editable_top_level_deps_preserved" # can't figure out how to select only one parameter to ignore - "test_filter_pip_markers" - "test_filter_pip_markes" - "test_generate_hashes_all_platforms" - "test_generate_hashes_verbose" - "test_generate_hashes_with_editable" - "test_generate_hashes_with_url" - "test_generate_hashes_without_interfering_with_each_other" - "test_get_file_hash_without_interfering_with_each_other" - "test_get_hashes_local_repository_cache_miss" - "test_realistic_complex_sub_dependencies" - "test_stdin" - "test_upgrade_packages_option" - "test_url_package" - "test_editable_package" - "test_locally_available_editable_package_is_not_archived_in_cache_dir" - ]; + checkInputs = [ pytest git glibcLocales mock pytest-xdist ]; + propagatedBuildInputs = [ pip click setuptools-scm pep517 ]; checkPhase = '' export HOME=$(mktemp -d) VIRTUAL_ENV=1 - py.test -k "${disabledTests}" + py.test -m "not network" ''; meta = with lib; {