From 2b202511c406f031054f9fcf0199a7481349b1fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 14:21:46 +0100 Subject: [PATCH 1/2] python312Packages.filedepot: refactor --- pkgs/development/python-modules/filedepot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix index b21b4590ebc3..6c744b64c3c8 100644 --- a/pkgs/development/python-modules/filedepot/default.nix +++ b/pkgs/development/python-modules/filedepot/default.nix @@ -29,9 +29,9 @@ buildPythonPackage rec { hash = "sha256-693H/u+Wg2G9sdoUkC6DQo9WkmIlKnh8NKv3ufK/eyQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ anyascii google-cloud-storage ]; From f57a3cbeb21cc91e50b2996c0e2c8d512515c5ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 14:29:58 +0100 Subject: [PATCH 2/2] python313Packages.filedepot: add legacy-cgi for Python 3.13 --- pkgs/development/python-modules/filedepot/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix index 6c744b64c3c8..e733f308646e 100644 --- a/pkgs/development/python-modules/filedepot/default.nix +++ b/pkgs/development/python-modules/filedepot/default.nix @@ -5,10 +5,12 @@ fetchFromGitHub, flaky, google-cloud-storage, + legacy-cgi, mock, pillow, pymongo, pytestCheckHook, + pythonAtLeast, pythonOlder, requests, setuptools, @@ -34,7 +36,7 @@ buildPythonPackage rec { dependencies = [ anyascii google-cloud-storage - ]; + ] ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; nativeCheckInputs = [ flaky @@ -56,6 +58,8 @@ buildPythonPackage rec { "tests/test_wsgi_middleware.py" ]; + disabledTests = lib.optionals (pythonAtLeast "3.13") [ "test_notexisting" ]; + pythonImportsCheck = [ "depot" ]; meta = with lib; {