From 81c1c63b70afeb19b32e853005636096482af56f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Apr 2023 17:40:02 +0200 Subject: [PATCH 1/3] python310Packages.clevercsv: 0.7.6 -> 0.8.0 https://github.com/alan-turing-institute/CleverCSV/blob/refs/tags/v0.8.0/CHANGELOG.md --- pkgs/development/python-modules/clevercsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index fdd2e1f894c1..b09946ba727f 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.7.6"; + version = "0.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "refs/tags/v${version}"; - hash = "sha256-mdsznhxTykEGZAFvTRZTCM11fR4tkwfpa95k7udE33c="; + hash = "sha256-/JveB6fpIJvR5byGcmO9XBuCbUw7yNTpSoDs68Wffmo="; }; propagatedBuildInputs = [ From 5b86546070673909913858240f4dfda1eed2af2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Apr 2023 17:44:04 +0200 Subject: [PATCH 2/3] python310Packages.clevercsv: Expose optional dependencies and prune them from the standard depencies propagated. --- .../python-modules/clevercsv/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index b09946ba727f..4ab05a964f56 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -1,11 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub + +# propagates , chardet +, regex +, packaging + +# optionals , faust-cchardet , pandas -, regex , tabview +# TODO: , wilderness + +# tests , python , pytestCheckHook }: @@ -24,15 +32,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet - faust-cchardet - pandas regex - tabview + packaging ]; + passthru.optional-dependencies = { + full = [ + faust-cchardet + pandas + tabview + # TODO: wilderness + ]; + }; + nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.full; pythonImportsCheck = [ "clevercsv" From b87655eb5f00e55a59aa3869f913153a764d977f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Apr 2023 17:51:35 +0200 Subject: [PATCH 3/3] python310Packages.deepdiff: Add python-dateutil to checkInputs Was previously propagated through clevercsv. --- pkgs/development/python-modules/deepdiff/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index f5ea937a4f15..df8f1420ea4d 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -8,6 +8,7 @@ , jsonpickle , numpy , pytestCheckHook +, python-dateutil , pyyaml , toml , pythonOlder @@ -50,6 +51,7 @@ buildPythonPackage rec { jsonpickle numpy pytestCheckHook + python-dateutil ] ++ passthru.optional-dependencies.cli; pythonImportsCheck = [