From 0465be1b8f0e6e2f72a0073efc3373c8b4e9f9ee Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 13:09:39 +0100 Subject: [PATCH 1/2] python311Packages.pysnow: fix deps, unbreak --- pkgs/development/python-modules/pysnow/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index f69e18f43137..41c8764639c0 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -9,6 +9,7 @@ poetry-core, python-magic, pytz, + six, pytestCheckHook, requests-oauthlib, }: @@ -25,6 +26,8 @@ buildPythonPackage rec { hash = "sha256-nKOPCkS2b3ObmBnk/7FTv4o4vwUX+tOtZI5OQQ4HSTY="; }; + pythonRelaxDeps = [ "requests-oauthlib" ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -32,6 +35,7 @@ buildPythonPackage rec { ijson python-magic pytz + six requests-oauthlib ]; From 226843be6a9f70eb803d5645467f0f95ec133231 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 21:16:56 +0100 Subject: [PATCH 2/2] python312Packages.pysnow: patch tests, unbreak --- pkgs/development/python-modules/pysnow/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index 41c8764639c0..1a7c541daea0 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -58,6 +58,10 @@ buildPythonPackage rec { --replace 'ijson = "^2.5.1"' 'ijson = "*"' \ --replace 'pytz = "^2019.3"' 'pytz = "*"' \ --replace 'oauthlib = "^3.1.0"' 'oauthlib = "*"' + + # https://github.com/rbw/pysnow/pull/201 doesn't apply via fetchpatch, so we recreate it + substituteInPlace tests/test_client.py tests/test_oauth_client.py tests/test_params_builder.py tests/test_resource.py \ + --replace-fail "self.assertEquals" "self.assertEqual" ''; pythonImportsCheck = [ "pysnow" ];