From 0cfd23c34ee05322c0ccad06dc4e91365c65ef70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 May 2022 06:38:36 +0000 Subject: [PATCH 1/2] python310Packages.pip-tools: 6.6.1 -> 6.6.2 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 2b079c8f00e3..ab48eb3e37b6 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.6.1"; + version = "6.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y04+jUcHJXwAQxPRap1sFMHOlNPA+h+Tw40mRAHy5PI="; + sha256 = "sha256-9jhQOp932Y2afXJYSxUI0/gu0Bm4+rJPTlrQeMG4yV4="; }; checkInputs = [ From 6d3a164c742ed0f333fcbed512733343a708ee58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 May 2022 10:07:33 +0200 Subject: [PATCH 2/2] python310Packages.pip-tools: update disable - update inputs - add pythonImportsCheck --- .../python-modules/pip-tools/default.nix | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index ab48eb3e37b6..41e4edbb6ba9 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,37 +1,30 @@ { lib -, fetchPypi -, pythonOlder -, buildPythonPackage -, pip -, pytestCheckHook -, pytest-xdist -, click -, setuptools-scm -, pep517 , stdenv +, buildPythonPackage +, click +, fetchPypi +, pep517 +, pip +, pytest-xdist +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { pname = "pip-tools"; version = "6.6.2"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9jhQOp932Y2afXJYSxUI0/gu0Bm4+rJPTlrQeMG4yV4="; + hash = "sha256-9jhQOp932Y2afXJYSxUI0/gu0Bm4+rJPTlrQeMG4yV4="; }; - checkInputs = [ - pytestCheckHook - pytest-xdist - ]; - - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 - export no_proxy='*'; - ''; - nativeBuildInputs = [ setuptools-scm ]; @@ -40,14 +33,30 @@ buildPythonPackage rec { click pep517 pip + setuptools + wheel ]; + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 + export no_proxy='*'; + ''; + disabledTests = [ - # these want internet access + # Tests require network access "network" "test_direct_reference_with_extras" ]; + pythonImportsCheck = [ + "piptools" + ]; + meta = with lib; { description = "Keeps your pinned dependencies fresh"; homepage = "https://github.com/jazzband/pip-tools/";