Unverified Commit 8d695df3 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #291340 from fabaff/aws-sam-cli-bump

aws-sam-cli: 1.108.0 -> 1.110.0
parents 5337ff6a 24eabec8
Loading
Loading
Loading
Loading
+26 −21
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@

python3.pkgs.buildPythonApplication rec {
  pname = "aws-sam-cli";
  version = "1.108.0";
  format = "pyproject";
  version = "1.110.0";
  pyproject = true;

  disabled = python3.pythonOlder "3.8";

@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "aws";
    repo = "aws-sam-cli";
    rev = "refs/tags/v${version}";
    hash = "sha256-k6SXCFkISyfr5/0vhe/Dfzs4qsVfu14lFx/bl53QxR4=";
    hash = "sha256-FJHHEsdi2uGP9/GxrANsVEuxZiS4M4BPBGoARQBQpkA=";
  };

  nativeBuildInputs = with python3.pkgs; [
@@ -28,16 +28,18 @@ python3.pkgs.buildPythonApplication rec {
  ];

  pythonRelaxDeps = [
    "aws-lambda-builders"
    "aws-sam-translator"
    "boto3-stubs"
    "cfn-lint"
    "tzlocal"
    "cookiecutter"
    "docker"
    "aws-lambda-builders"
    "tomlkit"
    "rich"
    "jsonschema"
    "pyopenssl"
    "rich"
    "ruamel-yaml"
    "tomlkit"
    "tzlocal"
  ];

  propagatedBuildInputs = with python3.pkgs; [
@@ -86,8 +88,6 @@ python3.pkgs.buildPythonApplication rec {
      --prefix PATH : $out/bin:${lib.makeBinPath [ git ]}
  '';

  doCheck = true;

  nativeCheckInputs = with python3.pkgs; [
    filelock
    flaky
@@ -105,22 +105,27 @@ python3.pkgs.buildPythonApplication rec {

  pytestFlagsArray = [
    "tests"
    # Disable warnings
    "-W"
    "ignore::DeprecationWarning"
  ];

  disabledTestPaths = [
    # Disable tests that requires networking or complex setup
    "--ignore=tests/end_to_end"
    "--ignore=tests/integration"
    "--ignore=tests/regression"
    "--ignore=tests/smoke"
    "--ignore=tests/unit/lib/telemetry"

    "tests/end_to_end"
    "tests/integration"
    "tests/regression"
    "tests/smoke"
    "tests/unit/lib/telemetry"
    # Disable flaky tests
    "--ignore=tests/unit/lib/samconfig/test_samconfig.py"
    "--deselect=tests/unit/lib/sync/flows/test_rest_api_sync_flow.py::TestRestApiSyncFlow::test_update_stage"
    "--deselect=tests/unit/lib/sync/flows/test_rest_api_sync_flow.py::TestRestApiSyncFlow::test_delete_deployment"
    "--deselect=tests/unit/local/lambda_service/test_local_lambda_invoke_service.py::TestValidateRequestHandling::test_request_with_no_data"
    "tests/unit/lib/samconfig/test_samconfig.py"
  ];

    # Disable warnings
    "-W ignore::DeprecationWarning"
  disabledTests = [
    # Disable flaky tests
    "test_update_stage"
    "test_delete_deployment"
    "test_request_with_no_data"
  ];

  pythonImportsCheck = [