From 7664e3024cb29feaad3c7e35fd5130eb8085b111 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 28 Oct 2024 09:32:43 +0100 Subject: [PATCH 1/3] python3Packages.django-storages: Fix tests --- .../python-modules/django-storages/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 1014efc09e65..705788845845 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -15,6 +15,7 @@ pythonOlder, rsa, setuptools, + fetchpatch, }: buildPythonPackage rec { @@ -31,6 +32,16 @@ buildPythonPackage rec { hash = "sha256-nlM/XPot3auLzNsnHCVtog2WmiaibDRgbPOw9A5F9QI="; }; + patches = [ + # Add Moto 5 support + # https://github.com/jschneier/django-storages/pull/1464 + (fetchpatch { + url = "https://github.com/jschneier/django-storages/commit/e1aedcf2d137f164101d31f2f430f1594eedd78c.patch"; + hash = "sha256-jSb/uJ0RXvPsXl+WUAzAgDvJl9Y3ad2F30X1SbsCc04="; + name = "add_moto_5_support.patch"; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ django ]; @@ -58,14 +69,10 @@ buildPythonPackage rec { disabledTests = [ # AttributeError: 'str' object has no attribute 'universe_domain' + # https://github.com/jschneier/django-storages/issues/1463 "test_storage_save_gzip" ]; - disabledTestPaths = [ - # ImportError: cannot import name 'mock_s3' from 'moto' - "tests/test_s3.py" - ]; - meta = with lib; { description = "Collection of custom storage backends for Django"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; From a7c4257694acda84e8f85e33f0daaf1fb6f904cb Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 28 Oct 2024 09:38:50 +0100 Subject: [PATCH 2/3] python3Packages.django-storages: Add missing test dependency --- pkgs/development/python-modules/django-storages/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 705788845845..28111a2db07b 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -15,6 +15,7 @@ pythonOlder, rsa, setuptools, + pynacl, fetchpatch, }: @@ -63,6 +64,8 @@ buildPythonPackage rec { rsa ] ++ lib.flatten (builtins.attrValues optional-dependencies); + checkInputs = [ pynacl ]; + pythonImportsCheck = [ "storages" ]; env.DJANGO_SETTINGS_MODULE = "tests.settings"; From 05daae7142d373b6f4a0a54acdd79d884817940b Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 28 Oct 2024 09:41:49 +0100 Subject: [PATCH 3/3] python3Packages.django-storages: Stylistic updates --- .../python-modules/django-storages/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 28111a2db07b..161012236047 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -43,9 +43,9 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; optional-dependencies = { azure = [ azure-storage-blob ]; @@ -76,12 +76,12 @@ buildPythonPackage rec { "test_storage_save_gzip" ]; - meta = with lib; { + meta = { description = "Collection of custom storage backends for Django"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; downloadPage = "https://github.com/jschneier/django-storages/"; homepage = "https://django-storages.readthedocs.io"; - license = licenses.bsd3; - maintainers = with maintainers; [ mmai ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mmai ]; }; }