diff --git a/ast_drop-compatible-releases-operator.patch b/ast_drop-compatible-releases-operator.patch deleted file mode 100644 index f3b77ba..0000000 --- a/ast_drop-compatible-releases-operator.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nru serverless-application-model-1.11.0.orig/requirements/base.txt serverless-application-model-1.11.0/requirements/base.txt ---- serverless-application-model-1.11.0.orig/requirements/base.txt 2019-04-26 00:03:58.000000000 +0200 -+++ serverless-application-model-1.11.0/requirements/base.txt 2019-07-10 14:43:48.484197605 +0200 -@@ -1,5 +1,5 @@ --boto3~=1.5 --enum34~=1.1; python_version<"3.4" --jsonschema~=2.6 --six~=1.11 -+boto3>=1.5 -+enum34>=1.1; python_version<"3.4" -+jsonschema>=2.6 -+six>=1.11 - diff --git a/python-aws-sam-translator.changes b/python-aws-sam-translator.changes index 4ea90c7..d388a00 100644 --- a/python-aws-sam-translator.changes +++ b/python-aws-sam-translator.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Nov 22 10:13:19 UTC 2019 - John Paul Adrian Glaubitz + +- Disable tests on SLE-12 as the testsuite is + incompatible with Python 3.4 +- Drop patch to support older versions of setuptools as + SLE-12 is now shipping with a recent enough version + + ast_drop-compatible-releases-operator.patch + ------------------------------------------------------------------- Fri Jul 19 13:07:21 UTC 2019 - Tomáš Chvátal diff --git a/python-aws-sam-translator.spec b/python-aws-sam-translator.spec index 31c0865..e1aab41 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) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,14 @@ # +# Disable tests on SLE-12 due to issues with Python 3.4 +# see: https://github.com/awslabs/serverless-application-model/issues/1255 +%if 0%{?suse_version} < 1500 +%bcond_with test +%else +%bcond_without test +%endif + %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-aws-sam-translator Version: 1.11.0 @@ -23,9 +31,8 @@ Release: 0 Summary: AWS SAM template to AWS CloudFormation template translator License: Apache-2.0 Group: Development/Languages/Python -Url: https://github.com/awslabs/serverless-application-model +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 -Patch: ast_drop-compatible-releases-operator.patch %if 0%{?suse_version} < 1500 BuildRequires: python %endif @@ -64,7 +71,6 @@ templates into AWS CloudFormation templates %prep %setup -q -n serverless-application-model-%{version} -%patch -p1 sed -i -e '1s|#!/usr/bin/env python2|#!/usr/bin/python3|' bin/sam-translate.py %build @@ -77,9 +83,11 @@ sed -i -e '1s|#!/usr/bin/env python2|#!/usr/bin/python3|' bin/sam-translate.py mkdir -p %{buildroot}%{_bindir} install -D -m 644 bin/sam-translate.py %{buildroot}%{_bindir}/sam-translate +%if %{with test} %check export LANG=en_US.UTF8 %pytest +%endif %files %{python_files} %doc README.md