From 63cc6594d13fca2973d6f31a816eb02210715689 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:52:09 +0200 Subject: [PATCH 1/7] python312Packages.dsnap: refactor --- pkgs/development/python-modules/dsnap/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix index d67cb02aa112..559048e0600e 100644 --- a/pkgs/development/python-modules/dsnap/default.nix +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { postPatch = '' # Is no direct dependency substituteInPlace pyproject.toml \ - --replace 'urllib3 = "^1.26.4"' 'urllib3 = "*"' + --replace-fail 'urllib3 = "^1.26.4"' 'urllib3 = "*"' ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ boto3 urllib3 ]; @@ -66,11 +66,11 @@ buildPythonPackage rec { meta = with lib; { description = "Utility for downloading and mounting EBS snapshots using the EBS Direct API's"; - mainProgram = "dsnap"; homepage = "https://github.com/RhinoSecurityLabs/dsnap"; changelog = "https://github.com/RhinoSecurityLabs/dsnap/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "dsnap"; }; } From fc19d1f5ed7b5d66607c53a0cedf092e065732bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:53:42 +0200 Subject: [PATCH 2/7] python312Packages.dsnap: disable tests https://github.com/RhinoSecurityLabs/dsnap/issues/26 ImportError: cannot import name 'mock_iam' from 'moto' --- pkgs/development/python-modules/dsnap/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix index 559048e0600e..3fb2da42d6e0 100644 --- a/pkgs/development/python-modules/dsnap/default.nix +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -60,6 +60,10 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + # https://github.com/RhinoSecurityLabs/dsnap/issues/26 + # ImportError: cannot import name 'mock_iam' from 'moto' + doCheck = false; + pythonImportsCheck = [ "dsnap" ]; From b97489f0d249aef35c332efcef2e14763cf35acc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:54:29 +0200 Subject: [PATCH 3/7] python312Packages.dsnap: format with nixfmt --- .../python-modules/dsnap/default.nix | 42 ++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix index 3fb2da42d6e0..f14636df0654 100644 --- a/pkgs/development/python-modules/dsnap/default.nix +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -1,17 +1,18 @@ -{ lib -, aws-sam-cli -, boto3 -, buildPythonPackage -, cfn-lint -, fetchFromGitHub -, mock -, moto -, mypy-boto3-ebs -, poetry-core -, pytestCheckHook -, pythonOlder -, typer -, urllib3 +{ + lib, + aws-sam-cli, + boto3, + buildPythonPackage, + cfn-lint, + fetchFromGitHub, + mock, + moto, + mypy-boto3-ebs, + poetry-core, + pytestCheckHook, + pythonOlder, + typer, + urllib3, }: buildPythonPackage rec { @@ -34,9 +35,7 @@ buildPythonPackage rec { --replace-fail 'urllib3 = "^1.26.4"' 'urllib3 = "*"' ''; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ boto3 @@ -44,9 +43,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - cli = [ - typer - ]; + cli = [ typer ]; scannerd = [ aws-sam-cli cfn-lint @@ -64,9 +61,7 @@ buildPythonPackage rec { # ImportError: cannot import name 'mock_iam' from 'moto' doCheck = false; - pythonImportsCheck = [ - "dsnap" - ]; + pythonImportsCheck = [ "dsnap" ]; meta = with lib; { description = "Utility for downloading and mounting EBS snapshots using the EBS Direct API's"; @@ -77,4 +72,3 @@ buildPythonPackage rec { mainProgram = "dsnap"; }; } - From 49b04c692749b198dc55f6a2866677b2e6a0e293 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:55:36 +0200 Subject: [PATCH 4/7] pacu: relax pycognito --- pkgs/by-name/pa/pacu/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 91122b15a79d..b5513e94b0ef 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -27,6 +27,7 @@ in python.pkgs.buildPythonApplication rec { "dsnap" "sqlalchemy-utils" "sqlalchemy" + "pycognito" "urllib3" ]; From ef4e2f85f1dee5c4ac59f5b92dd3dc6301efa699 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:56:28 +0200 Subject: [PATCH 5/7] pacu: refactor --- pkgs/by-name/pa/pacu/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index b5513e94b0ef..71528524e447 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -31,12 +31,15 @@ in python.pkgs.buildPythonApplication rec { "urllib3" ]; - nativeBuildInputs = with python.pkgs; [ + build-system = with python.pkgs; [ poetry-core + ]; + + nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ awscli ] ++ (with python.pkgs; [ awscli From 8d24f24690c3b3107d6c1c5db2e29d062f5bbf86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:58:23 +0200 Subject: [PATCH 6/7] pacu: disable failing tests --- pkgs/by-name/pa/pacu/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 71528524e447..8e43b56e987f 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -74,8 +74,9 @@ in python.pkgs.buildPythonApplication rec { ]; disabledTests = [ - # sqlalchemy.exc.ArgumentError: Textual SQL expression - #"test_migrations" + # sAttributeError: module 'moto' has no attribute 'mock_s3' + "test_update" + "test_update_second_time" ]; meta = with lib; { From 573b674cbab5d844aad989ac3f35171fc93b1a5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:58:43 +0200 Subject: [PATCH 7/7] pacu: format with nixfmt --- pkgs/by-name/pa/pacu/package.nix | 69 ++++++++++++++------------------ 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 8e43b56e987f..78491c24c697 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -1,17 +1,16 @@ -{ lib -, awscli -, fetchFromGitHub -, python3 +{ + lib, + awscli, + fetchFromGitHub, + python3, }: - let python = python3.override { - packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy_1_4; - }; + packageOverrides = self: super: { sqlalchemy = super.sqlalchemy_1_4; }; }; -in python.pkgs.buildPythonApplication rec { +in +python.pkgs.buildPythonApplication rec { pname = "pacu"; version = "1.5.2"; pyproject = true; @@ -31,34 +30,30 @@ in python.pkgs.buildPythonApplication rec { "urllib3" ]; - build-system = with python.pkgs; [ - poetry-core - ]; + build-system = with python.pkgs; [ poetry-core ]; - nativeBuildInputs = with python.pkgs; [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; - dependencies = [ - awscli - ] ++ (with python.pkgs; [ - awscli - boto3 - botocore - chalice - dsnap - jq - policyuniverse - pycognito - pyyaml - qrcode - requests - sqlalchemy - sqlalchemy-utils - toml - typing-extensions - urllib3 - ]); + dependencies = + [ awscli ] + ++ (with python.pkgs; [ + awscli + boto3 + botocore + chalice + dsnap + jq + policyuniverse + pycognito + pyyaml + qrcode + requests + sqlalchemy + sqlalchemy-utils + toml + typing-extensions + urllib3 + ]); nativeCheckInputs = with python.pkgs; [ moto @@ -69,9 +64,7 @@ in python.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - pythonImportsCheck = [ - "pacu" - ]; + pythonImportsCheck = [ "pacu" ]; disabledTests = [ # sAttributeError: module 'moto' has no attribute 'mock_s3'