From a4405f833498ed995cc72761878525d7d7c9c30c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:47:18 +0200 Subject: [PATCH 1/4] python311Packages.django-import-export: 3.3.8 -> 4.0.3 Changelog: https://github.com/django-import-export/django-import-export/blob/4.0.3/docs/changelog.rst --- .../python-modules/django-import-export/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 50e60202dc97..92e5daf6fd29 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -8,12 +8,13 @@ , python , pythonOlder , pytz +, setuptools-scm , tablib }: buildPythonPackage rec { pname = "django-import-export"; - version = "3.3.8"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,9 +23,13 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9BsaYLAkd6UvQxMtwk+pI7HyOWNU4rUmingkyemRCz4="; + hash = "sha256-ItJx9yJSy88/OvkpjGDWGBOMk5YlSquicSWi0tbKeWE="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ diff-match-patch django From 63e1bf13d579e441b4d6d6b7e715f7b1837a6cf4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:52:44 +0200 Subject: [PATCH 2/4] python311Packages.django-import-export: add optional-dependencies --- .../django-import-export/default.nix | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 92e5daf6fd29..b0e89e389274 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -34,13 +34,37 @@ buildPythonPackage rec { diff-match-patch django tablib - ] ++ (with tablib.optional-dependencies; html ++ ods ++ xls ++ xlsx ++ yaml); + ]; + + passthru.optional-dependencies = { + all = [ + tablib + ] ++ tablib.optional-dependencies.all; + cli = [ + tablib + ] ++ tablib.optional-dependencies.cli; + ods = [ + tablib + ] ++ tablib.optional-dependencies.ods; + pandas = [ + tablib + ] ++ tablib.optional-dependencies.pandas; + xls = [ + tablib + ] ++ tablib.optional-dependencies.xls; + xlsx = [ + tablib + ] ++ tablib.optional-dependencies.xlsx; + yaml = [ + tablib + ] ++ tablib.optional-dependencies.yaml; + }; nativeCheckInputs = [ chardet psycopg2 pytz - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); checkPhase = '' runHook preCheck From eaaf883c8599d0f5c9a6cd7d368786e8e27ebd00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:56:16 +0200 Subject: [PATCH 3/4] python311Packages.django-import-export: refactor --- .../django-import-export/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index b0e89e389274..fd6f0d43f7ea 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -7,6 +7,7 @@ , psycopg2 , python , pythonOlder +, pythonRelaxDepsHook , pytz , setuptools-scm , tablib @@ -15,22 +16,30 @@ buildPythonPackage rec { pname = "django-import-export"; version = "4.0.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "django-import-export"; - repo = pname; + repo = "django-import-export"; rev = "refs/tags/${version}"; hash = "sha256-ItJx9yJSy88/OvkpjGDWGBOMk5YlSquicSWi0tbKeWE="; }; - nativeBuildInputs = [ + pythonRelaxDeps = [ + "tablib" + ]; + + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + dependencies = [ diff-match-patch django tablib From 12ba07f728f610cdd680ee3e45d965b85f9be06d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 14:56:44 +0200 Subject: [PATCH 4/4] python311Packages.django-import-export: format with nixfmt --- .../django-import-export/default.nix | 71 +++++++------------ 1 file changed, 25 insertions(+), 46 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index fd6f0d43f7ea..a57a770444ed 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, chardet -, diff-match-patch -, django -, fetchFromGitHub -, psycopg2 -, python -, pythonOlder -, pythonRelaxDepsHook -, pytz -, setuptools-scm -, tablib +{ + lib, + buildPythonPackage, + chardet, + diff-match-patch, + django, + fetchFromGitHub, + psycopg2, + python, + pythonOlder, + pythonRelaxDepsHook, + pytz, + setuptools-scm, + tablib, }: buildPythonPackage rec { @@ -27,17 +28,11 @@ buildPythonPackage rec { hash = "sha256-ItJx9yJSy88/OvkpjGDWGBOMk5YlSquicSWi0tbKeWE="; }; - pythonRelaxDeps = [ - "tablib" - ]; + pythonRelaxDeps = [ "tablib" ]; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ diff-match-patch @@ -46,27 +41,13 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - all = [ - tablib - ] ++ tablib.optional-dependencies.all; - cli = [ - tablib - ] ++ tablib.optional-dependencies.cli; - ods = [ - tablib - ] ++ tablib.optional-dependencies.ods; - pandas = [ - tablib - ] ++ tablib.optional-dependencies.pandas; - xls = [ - tablib - ] ++ tablib.optional-dependencies.xls; - xlsx = [ - tablib - ] ++ tablib.optional-dependencies.xlsx; - yaml = [ - tablib - ] ++ tablib.optional-dependencies.yaml; + all = [ tablib ] ++ tablib.optional-dependencies.all; + cli = [ tablib ] ++ tablib.optional-dependencies.cli; + ods = [ tablib ] ++ tablib.optional-dependencies.ods; + pandas = [ tablib ] ++ tablib.optional-dependencies.pandas; + xls = [ tablib ] ++ tablib.optional-dependencies.xls; + xlsx = [ tablib ] ++ tablib.optional-dependencies.xlsx; + yaml = [ tablib ] ++ tablib.optional-dependencies.yaml; }; nativeCheckInputs = [ @@ -81,9 +62,7 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ - "import_export" - ]; + pythonImportsCheck = [ "import_export" ]; meta = with lib; { description = "Django application and library for importing and exporting data with admin integration";