diff --git a/no-more-utcnow-in-metrics.patch b/no-more-utcnow-in-metrics.patch new file mode 100644 index 0000000..f20b79e --- /dev/null +++ b/no-more-utcnow-in-metrics.patch @@ -0,0 +1,38 @@ +From aca3d4dca40b8d6b48c0a0f3b4bab5b0406f9865 Mon Sep 17 00:00:00 2001 +From: Steve Kowalik +Date: Thu, 8 Feb 2024 12:58:06 +1100 +Subject: [PATCH] Use datetime.now(utc) in MetricDatum + +datetime.utcnow() is deprecated as of Python 3.12, and its use will +raise a DeprecationWarning. Since warnings are treated as errors, this +results in test failures under Python 3.12. Switch to using +datetime.now() with a timezone.utc parameter. +--- + samtranslator/metrics/metrics.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/samtranslator/metrics/metrics.py b/samtranslator/metrics/metrics.py +index d026e9c13..72da530b7 100644 +--- a/samtranslator/metrics/metrics.py ++++ b/samtranslator/metrics/metrics.py +@@ -1,9 +1,10 @@ + """ + Helper classes to publish metrics + """ ++ + import logging + from abc import ABC, abstractmethod +-from datetime import datetime ++from datetime import datetime, timezone + from typing import Any, Dict, List, Optional, TypedDict, Union + + from samtranslator.internal.deprecation_control import deprecated +@@ -114,7 +115,7 @@ def __init__( + self.value = value + self.unit = unit + self.dimensions = dimensions if dimensions else [] +- self.timestamp = timestamp if timestamp else datetime.utcnow() ++ self.timestamp = timestamp if timestamp else datetime.now(timezone.utc) + + def get_metric_data(self) -> Dict[str, Any]: + return { diff --git a/python-aws-sam-translator.changes b/python-aws-sam-translator.changes index 4a3cecf..a8ea532 100644 --- a/python-aws-sam-translator.changes +++ b/python-aws-sam-translator.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Thu Feb 8 02:07:55 UTC 2024 - Steve Kowalik + +- Update to 1.84.0: + * chore(schema): update by @github-actions in #3490 + * chore(schema): update by @github-actions in #3492 + * chore(schema): update by @github-actions in #3494 + * chore(schema): update by @github-actions in #3497 + * chore: Less CloudFormation Schema Update PRs by @GavinZZ in #3498 + * chore(schema): update by @github-actions in #3499 + * chore(schema): update by @github-actions in #3503 + * Drop python3.7 support for SAM-T by @xazhao in #3403 + * chore(schema): update by @github-actions in #3404 + * fix: Raise exception when using dynamic reference in CodeUri Uri + format by @GavinZZ in #3405 + * chore: Update how we download CFN documentation by @GavinZZ in #3406 + * chore(schema): update by @github-actions in #3409 + * chore(schema): update by @github-actions in #3413 + * chore(schema): update by @github-actions in #3417 + * Merge main to develop by @xazhao in #3420 + * chore(schema): update by @github-actions in #3424 + * [chore]: keep cfn schema used by cfn-lint up-to-date by + @ssenchenko in #3425 + * adding new appsync props by @ssenchenko in #3423 + * chore(schema): update by @github-actions in #3427 + * chore(schema): update by @github-actions in #3421 + * chore(schema): update by @github-actions in #3428 + * fix: Tags with value of False got evaluated to "" by + @ConnorRobertson in #3429 + * chore(schema): update by @github-actions in #3430 + * chore(schema): update by @github-actions in #3441 + * fix: Msk Tests Failure due to Missing Permissions by @GavinZZ in #3443 + * chore: mq tests using a valid version by @ConnorRobertson in #3442 + * chore(schema): update by @github-actions in #3448 + * chore(schema): update by @github-actions in #3450 + * chore(schema): update by @github-actions in #3452 + * chore(schema): update by @github-actions in #3455 + * chore(schema): update by @github-actions in #3456 + * chore(schema): update by @github-actions in #3461 + * chore(schema): update by @github-actions in #3462 + * chore(schema): update by @github-actions in #3463 + * chore(schema): update by @github-actions in #3466 + * chore(schema): update by @github-actions in #3467 + * Chore:Upgrade integ tests to node to v18.x by @ConnorRobertson in #3468 + * chore(schema): update by @github-actions in #3469 + * fix: clearer error when a property that modifies an OpenApiDefinition + is set and a DefinitionBody is defined by @ConnorRobertson in #3470 + * chore(schema): update by @github-actions in #3471 + * fix: Allow Dynamic Reference in CodeUri Property if no / used + by @GavinZZ in #3472 + * chore(schema): update by @github-actions in #3473 + * chore(schema): update by @github-actions in #3474 + * chore: replace nodejs14.x with nodejs18.x by @xazhao in #3401 +- Add patch no-more-utcnow-in-metrics.patch: + * Stop calling a deprecated method. +- Switch to pyproject macros. + ------------------------------------------------------------------- Tue Dec 5 14:31:02 UTC 2023 - John Paul Adrian Glaubitz diff --git a/python-aws-sam-translator.spec b/python-aws-sam-translator.spec index 7e2e329..110a7c2 100644 --- a/python-aws-sam-translator.spec +++ b/python-aws-sam-translator.spec @@ -1,7 +1,7 @@ # # spec file for package python-aws-sam-translator # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,22 +27,25 @@ %define skip_python2 1 %endif Name: python-aws-sam-translator -Version: 1.81.0 +Version: 1.84.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 +# PATCH-FIX-UPSTREAM gh#aws/serverless-application-model#3538 +Patch0: no-more-utcnow-in-metrics.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-boto3 >= 1.19.5 Requires: python-jsonschema >= 3.2 Requires: python-pydantic >= 1.8 -Requires: (python-typing_extensions >= 4.4.0 if python-base < 3.7) +Requires: python-typing_extensions >= 4.4.0 Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives BuildArch: noarch %if 0%{?suse_version} < 1500 BuildRequires: python @@ -74,10 +77,10 @@ sed -i -e 's:~=:>=:g' requirements/base.txt rm bin/__init__.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} mkdir -p %{buildroot}%{_bindir} @@ -110,6 +113,6 @@ donttest="$donttest test_is_service_supported_positive_4_ec2" %license LICENSE %python_alternative %{_bindir}/sam-translate %{python_sitelib}/samtranslator -%{python_sitelib}/aws_sam_translator-%{version}*-info +%{python_sitelib}/aws_sam_translator-%{version}.dist-info %changelog diff --git a/serverless-application-model-1.81.0.tar.gz b/serverless-application-model-1.81.0.tar.gz deleted file mode 100644 index a6b853a..0000000 --- a/serverless-application-model-1.81.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4f4e3386f98ecd4d7d25227ee99c9cd33803f890a7c1ba4b14d045faf3d4fad -size 5135291 diff --git a/serverless-application-model-1.84.0.tar.gz b/serverless-application-model-1.84.0.tar.gz new file mode 100644 index 0000000..ecff67d --- /dev/null +++ b/serverless-application-model-1.84.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f57808b9cbd7d3dbac23c06ca9930360dbeeadc8947ae819a2d4e1fa2d45b69 +size 5467750