diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 341c66620c39..1119435b48c2 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -7,15 +7,16 @@ , pyelftools , pytestCheckHook , pythonOlder +, setuptools , six }: buildPythonPackage rec { pname = "aws-lambda-builders"; version = "1.47.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "awslabs"; @@ -26,10 +27,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "version=read_version()," 'version="${version}",' + --replace-fail "version=read_version()," 'version="${version}",' ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ six ]; @@ -57,11 +62,17 @@ buildPythonPackage rec { "TestPythonPipWorkflow" "TestRubyWorkflow" "TestRustCargo" + "test_with_mocks" # Tests which are passing locally but not on Hydra "test_copy_dependencies_action_1_multiple_files" "test_move_dependencies_action_1_multiple_files" ]; + disabledTestPaths = [ + # Dotnet binary needed + "tests/integration/workflows/dotnet_clipackage/test_dotnet.py" + ]; + pythonImportsCheck = [ "aws_lambda_builders" ]; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 5ab92dbe8b18..8e55c5884bbd 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.110.0"; + version = "1.113.0"; pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -19,10 +19,10 @@ python3.pkgs.buildPythonApplication rec { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-FJHHEsdi2uGP9/GxrANsVEuxZiS4M4BPBGoARQBQpkA="; + hash = "sha256-9DHqjhJfWkMJxu2gccbbuzoW9IxDqCBoi8slWnugeJM="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ pythonRelaxDepsHook setuptools ]; @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { "tzlocal" ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ aws-lambda-builders aws-sam-translator boto3