From ffa28b938f682d0007e44a8d149d2d5bf95ba36c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 29 Oct 2024 09:44:27 +0100 Subject: [PATCH] python3Packages.easy-thumbnails: 2.8.5 -> 2.10.0 --- .../easy-thumbnails/default.nix | 49 +++++++++++++------ 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 11c5aa483f59..9af1c37cbd33 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -2,42 +2,63 @@ lib, buildPythonPackage, django, - fetchPypi, + fetchFromGitHub, pillow, pythonOlder, reportlab, svglib, + pytestCheckHook, + pytest-django, + setuptools, + testfixtures, }: buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.10"; - format = "setuptools"; + version = "2.10.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-0AlGL815Ht8kluXtRtBEcS4aBrfUYA5M8oEgAumQTvU="; + src = fetchFromGitHub { + owner = "SmileyChris"; + repo = "easy-thumbnails"; + rev = "refs/tags/${version}"; + hash = "sha256-8JTHYQIBbu/4fknK2ZEQeDSgaxKGDfflxumcFMpaGQk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django pillow - svglib reportlab + svglib ]; - # Tests require a Django instance which is setup - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; + + checkInputs = [ testfixtures ]; + + disabledTests = [ + # AssertionError: 'ERROR' != 'INFO' + "test_postprocessor" + ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE="easy_thumbnails.tests.settings" + ''; pythonImportsCheck = [ "easy_thumbnails" ]; - meta = with lib; { + meta = { description = "Easy thumbnails for Django"; homepage = "https://github.com/SmileyChris/easy-thumbnails"; changelog = "https://github.com/SmileyChris/easy-thumbnails/blob/${version}/CHANGES.rst"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.onny ]; }; }