diff --git a/python-aws-sam-translator.changes b/python-aws-sam-translator.changes index 8d8616e..41d6348 100644 --- a/python-aws-sam-translator.changes +++ b/python-aws-sam-translator.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Sep 1 15:44:47 UTC 2023 - John Paul Adrian Glaubitz +Thu Sep 7 11:31:24 UTC 2023 - John Paul Adrian Glaubitz - Update to version 1.74.0 * fix:RuntimeManagementConfig by @ConnorRobertson in #3274 @@ -45,7 +45,14 @@ Fri Sep 1 15:44:47 UTC 2023 - John Paul Adrian Glaubitz + +- Update to version 1.71.0 * chore(schema): update by @github-actions in #3192 * chore: make statemachine cw events test nonblocking by @aaythapa in #3196 * feat: make add_transform_test.py always match expected output by @hoffa in #3195 diff --git a/python-aws-sam-translator.spec b/python-aws-sam-translator.spec index 869df04..28ec425 100644 --- a/python-aws-sam-translator.spec +++ b/python-aws-sam-translator.spec @@ -27,13 +27,13 @@ %define skip_python2 1 %endif Name: python-aws-sam-translator -Version: 1.71.0 +Version: 1.74.0 Release: 0 Summary: AWS SAM template to AWS CloudFormation template translator License: Apache-2.0 URL: https://github.com/awslabs/serverless-application-model Source: https://github.com/awslabs/serverless-application-model/archive/v%{version}.tar.gz#/serverless-application-model-%{version}.tar.gz -Patch0: skip-tests-require-network.patch +#Patch0: skip-tests-require-network.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -87,11 +87,16 @@ install -D -m 755 bin/sam-translate.py %{buildroot}%{_bindir}/sam-translate %if %{with test} %check export LANG=en_US.UTF8 -# test_is_service_supported_positive_4_ec2: -# samtranslator/region_configuration.py:52: NoRegionFound -# test_errors_13_error_definitionuri: -# AssertionError: Expected 7 errors, found 9 -%pytest -k 'not (test_is_service_supported_positive_4_ec2 or test_errors_13_error_definitionuri or test_py27_hash)' +donttest="test_plugin_accepts_different_sar_client or test_plugin_accepts_flags or" +donttest="$donttest test_plugin_accepts_parameters or test_plugin_default_values or" +donttest="$donttest test_plugin_invalid_configuration_raises_exception or test_plugin_must_setup_correct_name or" +donttest="$donttest test_must_process_applications or test_must_process_applications_validate or" +donttest="$donttest test_process_invalid_applications or test_process_invalid_applications_validate or" +donttest="$donttest test_resolve_intrinsics or test_sar_service_calls or test_sar_success_one_app or" +donttest="$donttest test_sar_throttling_doesnt_stop_processing or test_sleep_between_sar_checks or" +donttest="$donttest test_unexpected_sar_error_stops_processing or test_time_limit_exceeds_between_combined_sar_calls or" +donttest="$donttest test_is_service_supported_positive_4_ec2" +%pytest -k "not ($donttest)" %endif %post diff --git a/serverless-application-model-1.71.0.tar.gz b/serverless-application-model-1.71.0.tar.gz deleted file mode 100644 index 31f73cd..0000000 --- a/serverless-application-model-1.71.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bdcc10b9dc70e8adb68b62dfed190c5112d7d628bab51ea3413b6582235f054 -size 6001064 diff --git a/serverless-application-model-1.74.0.tar.gz b/serverless-application-model-1.74.0.tar.gz new file mode 100644 index 0000000..f65638e --- /dev/null +++ b/serverless-application-model-1.74.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b629ae028344e9e8e885217b223504d6faa29ecabb2760dd3c95110ac5485dbb +size 5082475 diff --git a/skip-tests-require-network.patch b/skip-tests-require-network.patch deleted file mode 100644 index 9e787f3..0000000 --- a/skip-tests-require-network.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nru serverless-application-model-1.68.0.orig/tests/plugins/application/test_serverless_app_plugin.py serverless-application-model-1.68.0/tests/plugins/application/test_serverless_app_plugin.py ---- serverless-application-model-1.68.0.orig/tests/plugins/application/test_serverless_app_plugin.py 2023-05-25 20:47:48.000000000 +0200 -+++ serverless-application-model-1.68.0/tests/plugins/application/test_serverless_app_plugin.py 2023-06-15 16:12:56.049114662 +0200 -@@ -1,5 +1,6 @@ - from unittest import TestCase - from unittest.mock import Mock, patch -+import unittest - - import boto3 - from botocore.exceptions import ClientError -@@ -114,7 +115,7 @@ - self.assertEqual(plugin._sar_client, sar_client) - self.client_mock.assert_not_called() - -- -+@unittest.skip("Skip tests that requires network") - class TestServerlessAppPlugin_on_before_transform_template_translate(TestCase): - def setUp(self): - client = boto3.client("serverlessrepo", region_name="us-east-1") -@@ -453,7 +454,7 @@ - self.assertEqual(client.get_cloud_formation_template.call_count, 2) - self.assertEqual(plugin._get_sleep_time_sec.call_count, 1) # make sure we slept once - -- -+@unittest.skip("Skip tests that requires network") - class TestServerlessAppPlugin_on_before_and_on_after_transform_template(TestCase): - @patch("samtranslator.plugins.application.serverless_app_plugin.SamTemplate") - def test_time_limit_exceeds_between_combined_sar_calls(self, SamTemplateMock):