From 936647b5cd03c60cc01aee4b241318109d067c37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 02:55:21 +0000 Subject: [PATCH 1/2] python312Packages.django-model-utils: 4.4.0 -> 4.5.0 --- .../development/python-modules/django-model-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix index 36003b6625c2..88b90a48daf9 100644 --- a/pkgs/development/python-modules/django-model-utils/default.nix +++ b/pkgs/development/python-modules/django-model-utils/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-model-utils"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-model-utils"; rev = "refs/tags/${version}"; - hash = "sha256-/9gLovZGUwdoz3o3LZBfQ7iWr95cpTWq2YqFKoQC9kY="; + hash = "sha256-ZEnDk4kCXyhLvq3CZTK/zP3IK6BsNRqbkfqKAuU6Mfk="; }; nativeBuildInputs = [ From a17ddd589fce47e333cab1424403989e20bd97d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Apr 2024 09:43:43 +0200 Subject: [PATCH 2/2] python312Packages.django-model-utils: refactor --- .../django-model-utils/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix index 88b90a48daf9..0e39d901aae8 100644 --- a/pkgs/development/python-modules/django-model-utils/default.nix +++ b/pkgs/development/python-modules/django-model-utils/default.nix @@ -2,10 +2,6 @@ , buildPythonPackage , fetchFromGitHub , django -, freezegun -, psycopg2 -, pytest-django -, pytestCheckHook , pythonOlder , setuptools-scm }: @@ -13,7 +9,7 @@ buildPythonPackage rec { pname = "django-model-utils"; version = "4.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,26 +20,21 @@ buildPythonPackage rec { hash = "sha256-ZEnDk4kCXyhLvq3CZTK/zP3IK6BsNRqbkfqKAuU6Mfk="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ django ]; - # requires postgres database + # Test requires postgres database doCheck = false; - nativeCheckInputs = [ - freezegun - psycopg2 - pytest-django - pytestCheckHook + pythonImportsCheck = [ + "model_utils" ]; - pythonImportsCheck = [ "model_utils" ]; - meta = with lib; { homepage = "https://github.com/jazzband/django-model-utils"; description = "Django model mixins and utilities";