From 305a93a7257aa399aa1ab1cf0d5d6115b3eaa6c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 02:44:36 +0100 Subject: [PATCH 1/2] python313Packages.drf-ujson2: 1.7.2 -> 1.8.0 https://github.com/Amertz08/drf_ujson2/releases/tag/v1.8.0 --- .../python-modules/drf-ujson2/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/drf-ujson2/default.nix b/pkgs/development/python-modules/drf-ujson2/default.nix index e0a04ac41669..94be92161e00 100644 --- a/pkgs/development/python-modules/drf-ujson2/default.nix +++ b/pkgs/development/python-modules/drf-ujson2/default.nix @@ -2,6 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, + + # build-system + setuptools, # dependencies django, @@ -9,6 +13,7 @@ ujson, # tests + pytest-cov-stub, pytest-django, pytest-mock, pytestCheckHook, @@ -16,23 +21,22 @@ buildPythonPackage rec { pname = "drf-ujson2"; - version = "1.7.2"; - format = "setuptools"; + version = "1.8.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Amertz08"; repo = "drf_ujson2"; tag = "v${version}"; - hash = "sha256-kbpZN1zOXHvRPcn+Sjbelq74cWgvCUeMXZy1eFSa6rA="; + hash = "sha256-NtloZWsEmRbPl7pdxPQqpzIzTyyOEFO9KtZ60F7VuUQ="; }; - postPatch = '' - sed -i '/--cov/d' setup.cfg - ''; + build-system = [ setuptools ]; - buildInputs = [ django ]; - - propagatedBuildInputs = [ + dependencies = [ + django djangorestframework ujson ]; @@ -40,6 +44,7 @@ buildPythonPackage rec { env.DJANGO_SETTINGS_MODULE = "tests.settings"; nativeCheckInputs = [ + pytest-cov-stub pytest-django pytest-mock pytestCheckHook @@ -49,6 +54,7 @@ buildPythonPackage rec { changelog = "https://github.com/Amertz08/drf_ujson2/releases/tag/v${version}"; description = "JSON parser and renderer using ujson for Django Rest Framework"; homepage = "https://github.com/Amertz08/drf_ujson2"; + license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; } From 712f6ff8ce07c26285d972c13bafbdcf8833267a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Feb 2025 03:04:42 +0100 Subject: [PATCH 2/2] pretix: relax drf-ujson2 constraint --- pkgs/by-name/pr/pretix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index d44f0f5df26c..52f8e728eb21 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -83,6 +83,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "django-phonenumber-field" "dnspython" + "drf_ujson2" "importlib-metadata" "kombu" "markdown"