From b56c60cdd600013f25f2fd23aa3a0e4e67168545 Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Mon, 27 May 2024 19:45:26 +0200 Subject: [PATCH 1/3] python311Packages.djangorestframework: 3.14.0 -> 3.15.1 https://github.com/encode/django-rest-framework/releases/tag/3.15.1 Co-Authored-By: Martin Weinelt --- .../misc/tandoor-recipes/default.nix | 8 ++++ .../office/paperless-ngx/default.nix | 8 ++++ pkgs/by-name/pr/pretalx/package.nix | 8 ++++ .../djangorestframework/default.nix | 38 +++++++++++++------ 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index e4c7c51112a5..a0640b8ec78b 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -16,6 +16,14 @@ let }; propagatedBuildInputs = [ super.decorator super.six ]; }); + + djangorestframework = super.djangorestframework.overridePythonAttrs (oldAttrs: rec { + version = "3.14.0"; + src = oldAttrs.src.override { + rev = version; + hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; + }; + }); }; }; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index d9ce09de6c13..7b3a9c97e7f6 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -50,6 +50,14 @@ let hash = "sha256-ng98DTw49zyFjrPnEwfnPfONyjKKZYuLl0qduxSppYk="; }; }); + + djangorestframework = prev.djangorestframework.overridePythonAttrs (oldAttrs: rec { + version = "3.14.0"; + src = oldAttrs.src.override { + rev = version; + hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; + }; + }); }; }; diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 4674812339ae..255af6f402a4 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -25,6 +25,14 @@ let # fails with some assertions doCheck = false; }); + + djangorestframework = prev.djangorestframework.overridePythonAttrs (oldAttrs: rec { + version = "3.14.0"; + src = oldAttrs.src.override { + rev = version; + hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; + }; + }); }; }; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 6b969183d46f..d151b538bf99 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -2,20 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, - coreapi, - django, - django-guardian, pythonOlder, - pytest-django, - pytest7CheckHook, + + # build-system + setuptools, + + # dependencies + django, pytz, + + # tests + coreapi, + coreschema, + django-guardian, + inflection, + psycopg2, + pytestCheckHook, + pytest-django, pyyaml, - uritemplate, }: buildPythonPackage rec { pname = "djangorestframework"; - version = "3.14.0"; + version = "3.15.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,28 +32,35 @@ buildPythonPackage rec { owner = "encode"; repo = "django-rest-framework"; rev = version; - hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; + hash = "sha256-G914NvxRmKGkxrozoWNUIoI74YkYRbeNcQwIG4iSeXU="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ django pytz ]; nativeCheckInputs = [ pytest-django - pytest7CheckHook + pytestCheckHook # optional tests coreapi + coreschema django-guardian + inflection + psycopg2 pyyaml - uritemplate ]; pythonImportsCheck = [ "rest_framework" ]; meta = with lib; { + changelog = "https://github.com/encode/django-rest-framework/releases/tag/3.15.1"; description = "Web APIs for Django, made easy"; homepage = "https://www.django-rest-framework.org/"; maintainers = with maintainers; [ desiderius ]; From 40e096015646a738ab707f131f5792b0ada57e35 Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Wed, 12 Jun 2024 10:07:29 +0200 Subject: [PATCH 2/3] python311Packages.django-dynamic-preferences: disable tests on Python 3.12 Configure imports check for good measure. --- .../python-modules/django-dynamic-preferences/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 3b97a3ad8367..28f9368de776 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, # dependencies django, @@ -39,6 +40,11 @@ buildPythonPackage rec { pytest-django ]; + pythonImportsCheck = [ "dynamic_preferences" ]; + + # Remove once https://github.com/agateblue/django-dynamic-preferences/issues/309 is fixed + doCheck = pythonOlder "3.12"; + env.DJANGO_SETTINGS = "tests.settings"; meta = with lib; { From ffb56088d5a1c89f1a367e756b70288f5912ac35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Jun 2024 20:12:09 +0200 Subject: [PATCH 3/3] python311Packages.graphene-django: 3.2.1 -> 3.2.2 https://github.com/graphql-python/graphene-django/releases/tag/v3.2.2 --- pkgs/development/python-modules/graphene-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 8453df70b031..254b2ae16a53 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "3.2.1"; + version = "3.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wzU9U4mYvBf43qBQi20ewKtmw1eFskQk+nnsdaM7HQM="; + hash = "sha256-12ue7Pq7TFMSBAfaj8Si6KrpuKYp5T2EEesJpc8wRho="; }; postPatch = ''