diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix index 01a20b3b9ccb..a51ca8ee3066 100644 --- a/pkgs/by-name/aw/aws-sam-cli/package.nix +++ b/pkgs/by-name/aw/aws-sam-cli/package.nix @@ -2,7 +2,6 @@ lib, python3, fetchFromGitHub, - fetchpatch2, git, testers, aws-sam-cli, @@ -12,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.154.0"; + version = "1.160.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-sam-cli"; tag = "v${version}"; - hash = "sha256-wy6LZbWmK5rb0foFttPOvDOsFtrQNFc8mGBP9WTzVyw="; + hash = "sha256-IBxnBIgTSpPUNb/4yx3OqA7WFzudzRKgkKCFsJeyx08="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -30,6 +29,7 @@ python3.pkgs.buildPythonApplication rec { "boto3" "boto3-stubs" "cfn-lint" + "click" "cookiecutter" "docker" "jsonschema" @@ -58,6 +58,7 @@ python3.pkgs.buildPythonApplication rec { flask jsonschema pyopenssl + python-dotenv pyyaml requests rich @@ -87,20 +88,6 @@ python3.pkgs.buildPythonApplication rec { ] ); - patches = [ - # Remove after aws-sam-cli > 1.154.0 - (fetchpatch2 { - url = "https://github.com/aws/aws-sam-cli/commit/1e1664faae8ff799cbb03fe16ef1650689803587.patch"; - hash = "sha256-HnOBrKkE/sIGZrgRq8G+ef1wnGvtALV4wma8J5eZfLc="; - }) - ]; - - # Remove after upstream bumps click > 8.1.8 - postPatch = '' - substituteInPlace requirements/base.txt --replace-fail \ - 'click==8.1.8' 'click==${python3.pkgs.click.version}' - ''; - postFixup = '' # Disable telemetry: https://github.com/aws/aws-sam-cli/issues/1272 wrapProgram $out/bin/sam \ @@ -129,9 +116,7 @@ python3.pkgs.buildPythonApplication rec { "-Wignore::DeprecationWarning" ]; - enabledTestPaths = [ - "tests" - ]; + enabledTestPaths = [ "tests" ]; disabledTestPaths = [ # Disable tests that requires networking or complex setup @@ -158,6 +143,8 @@ python3.pkgs.buildPythonApplication rec { "test_delete_deployment" "test_request_with_no_data" "test_import_should_succeed_for_a_defined_hidden_package_540_pkg_resources_py2_warn" + "test_updates_imageuri_when_pointing_to_local_archive" + "test_subcommand_help_0_invoke" ]; pythonImportsCheck = [ "samcli" ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index e041fabc9cd9..25e27be14f48 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.43.11"; + version = "1.43.13"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-PZ9xPo1eVRFtQCSYCHvRubj8m11abbrcp7uJus0ki0E="; + hash = "sha256-bjAYJbQILdjRIc8qpKx9nGVOm7MzOz/B0QAPTsSnClE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 4001e3bed91d..b4bb09840da7 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -163,8 +163,8 @@ in "sha256-FZuhcgbPBohluThfTy99inR5nyG0r3q/AsxNEvtgJU4="; mypy-boto3-batch = - buildMypyBoto3Package "batch" "1.43.7" - "sha256-4Xj/9Sq0wIs5ldX+WsnUkVKqGmT0xB9fpw8G6Km0hjw="; + buildMypyBoto3Package "batch" "1.43.13" + "sha256-IKmXHaiMMKM3qwpD3Vwec8BO5C/K+LRfBsxBsYhQ8xo="; mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.43.7" @@ -207,8 +207,8 @@ in "sha256-Vtu56EDQljvG3JZbiqt3CJzhquUIbYY2/Kn7QXw4Poc="; mypy-boto3-cleanrooms = - buildMypyBoto3Package "cleanrooms" "1.43.0" - "sha256-iQRlqBZZG4pnuy57HXKwFYJ64+wkS9v7h/pKl19R5sg="; + buildMypyBoto3Package "cleanrooms" "1.43.13" + "sha256-y9b/pwcRa4VFZ0v0rDwzdzYTnCyn6lgeNmk9JTLRtEI="; mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.43.0" @@ -363,8 +363,8 @@ in "sha256-pi0hMLpgYGrNU0/infONBg2WmES6NV0tfPgTjuRtWXk="; mypy-boto3-customer-profiles = - buildMypyBoto3Package "customer-profiles" "1.43.0" - "sha256-P+3AG1/Dj29UUJyAfXJcLvBxnLq6miVReVirg+/ewks="; + buildMypyBoto3Package "customer-profiles" "1.43.12" + "sha256-oOc34HWsr7PyUpweMBi3pjorIWKFbi5qNXDdPBF2VXA="; mypy-boto3-databrew = buildMypyBoto3Package "databrew" "1.43.0" @@ -758,8 +758,8 @@ in "sha256-SjI/irHvvEjhPyjQcEf1VAWM80ZLH76EFs/1JFDuTi4="; mypy-boto3-kms = - buildMypyBoto3Package "kms" "1.43.0" - "sha256-x7burzJDYflPJr+SFtUMjL1DJ0qwRHe1GL79TCZBWDg="; + buildMypyBoto3Package "kms" "1.43.12" + "sha256-pNI/AYQip5vEqIZnb2PrpUipiwb13NA5XkJNfEcus0A="; mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.43.0" @@ -854,8 +854,8 @@ in "sha256-Ob9sh8Ng8I3sWiy/qwu+lfSvf+W2KQiprWX6QCNiSLM="; mypy-boto3-mediaconnect = - buildMypyBoto3Package "mediaconnect" "1.43.0" - "sha256-OT4bGX7DaTrMuzEdK71GemaeWzPa7MbDd4+bApuPZLw="; + buildMypyBoto3Package "mediaconnect" "1.43.13" + "sha256-4hBMy4j3GdSdq7MyeU8a1WHYrM0mb56OlqPeKkdbt7w="; mypy-boto3-mediaconvert = buildMypyBoto3Package "mediaconvert" "1.43.0" @@ -934,8 +934,8 @@ in "sha256-Igsngmg9PeJcyqX/Ih+fgzUuBotaf+2UWHK9RKEePL4="; mypy-boto3-mwaa = - buildMypyBoto3Package "mwaa" "1.43.5" - "sha256-TKqSy42P9Pmd9jbfsUadZT2qn4SRE8PPbad4gbUHUo0="; + buildMypyBoto3Package "mwaa" "1.43.12" + "sha256-K6PcvRVHUGRXbsro9CbPJ9GQQ8mrjsrgU6nr/MXV4vg="; mypy-boto3-neptune = buildMypyBoto3Package "neptune" "1.43.0" @@ -1002,8 +1002,8 @@ in "sha256-0O67JQj59+esJWCBGVzRNj73yBbnldhay28rxh7nlN0="; mypy-boto3-payment-cryptography-data = - buildMypyBoto3Package "payment-cryptography-data" "1.43.0" - "sha256-Npyleoivecba7q9HyHNFRjs66fwNGR5dsAsu4e51luo="; + buildMypyBoto3Package "payment-cryptography-data" "1.43.12" + "sha256-SvSi3Mzf+Er3keeO4BeeIrfPKkzwZtKENKuAbaEz28c="; mypy-boto3-pca-connector-ad = buildMypyBoto3Package "pca-connector-ad" "1.43.0" @@ -1170,8 +1170,8 @@ in "sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.43.11" - "sha256-fajK9mOIDbfYcEftRqZDbktC1nOLa9xWIEnOzUwiLYA="; + buildMypyBoto3Package "sagemaker" "1.43.13" + "sha256-CJ76WLP0ZpfjCb7tjjpRE0G5b+Xi9bygNHOWjZtdBsE="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0" @@ -1374,8 +1374,8 @@ in "sha256-3gP5TN3PkxdmGXMMACoCASgaJnlRp1hdnzfHRLjYiWo="; mypy-boto3-verifiedpermissions = - buildMypyBoto3Package "verifiedpermissions" "1.43.0" - "sha256-iuOLfL7+iJAL2AOxDmL7aPUG3PEgTB+BsdwepYKTZ1E="; + buildMypyBoto3Package "verifiedpermissions" "1.43.13" + "sha256-TtndYsK7U4b9f1LWtXadwD3SyRPkx3uhjRIGYxybW1s="; mypy-boto3-voice-id = buildMypyBoto3Package "voice-id" "1.43.0"