Accepting request 801242 from devel:languages:python:aws

OBS-URL: https://build.opensuse.org/request/show/801242
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-aws-sam-translator?expand=0&rev=6

python-aws-sam-translator.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon May  4 07:16:01 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 1.22.0:
+  * Many parsing changes to enumerate, fixes for new syntax
+- Fix the saml-translate binary to be executable
+
+-------------------------------------------------------------------
+Mon May  4 07:13:21 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Fix build without python2
+- Do not ship generic folder with tests in sitelib
+
 -------------------------------------------------------------------
 Fri Nov 22 10:13:19 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 

python-aws-sam-translator.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-aws-sam-translator
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 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,7 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 # 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
@@ -23,46 +24,45 @@
 %else
 %bcond_without test
 %endif
-
+%bcond_without python2
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-aws-sam-translator
-Version:        1.11.0
+Version:        1.22.0
 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
 Source:         https://github.com/awslabs/serverless-application-model/archive/v%{version}.tar.gz#/serverless-application-model-%{version}.tar.gz
-%if 0%{?suse_version} < 1500
-BuildRequires:  python
-%endif
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       python-PyYAML >= 4.2
+Requires:       python-boto3 >= 1.5
+Requires:       python-docopt >= 0.6.2
+Requires:       python-jsonschema >= 3.0
+Requires:       python-six >= 1.11
+BuildArch:      noarch
+%if 0%{?suse_version} < 1500
+BuildRequires:  python
+%endif
 # SECTION test requirements
-BuildRequires:  %{python_module PyYAML >= 4.2}
+BuildRequires:  %{python_module PyYAML >= 5.1}
 BuildRequires:  %{python_module boto3 >= 1.5}
 BuildRequires:  %{python_module coverage >= 4.4.0}
-BuildRequires:  %{python_module jsonschema >= 2.6}
+BuildRequires:  %{python_module docopt >= 0.6.2}
+BuildRequires:  %{python_module jsonschema >= 3.0}
 BuildRequires:  %{python_module mock >= 2.0.0}
 BuildRequires:  %{python_module parameterized >= 0.6.1}
-BuildRequires:  %{python_module py >= 1.4.33}
 BuildRequires:  %{python_module pytest >= 3.0.7}
 BuildRequires:  %{python_module pytest-cov >= 2.4.0}
 BuildRequires:  %{python_module requests >= 2.20.0}
 BuildRequires:  %{python_module six >= 1.11}
+%if %{with python2}
 BuildRequires:  python-enum34 >= 1.1
+%endif
 # /SECTION
-Requires:       python-PyYAML >= 4.2
-Requires:       python-boto3 >= 1.5
-Requires:       python-docopt >= 0.6.2
-Requires:       python-jsonschema >= 2.6
-Requires:       python-six >= 1.11
 %ifpython2
 Requires:       python-enum34 >= 1.1
 %endif
-BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -71,17 +71,19 @@ templates into AWS CloudFormation templates
 
 %prep
 %setup -q -n serverless-application-model-%{version}
-sed -i -e '1s|#!/usr/bin/env python2|#!/usr/bin/python3|' bin/sam-translate.py
+sed -i -e '1s|#!%{_bindir}/env python2|#!%{_bindir}/python3|' bin/sam-translate.py
+sed -i -e 's:~=:>=:g' requirements/base.txt
 
 %build
 %python_build
 
 %install
 %python_install
+%python_expand rm -r %{buildroot}%{$python_sitelib}/tests/
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 mkdir -p %{buildroot}%{_bindir}
-install -D -m 644 bin/sam-translate.py %{buildroot}%{_bindir}/sam-translate
+install -D -m 755 bin/sam-translate.py %{buildroot}%{_bindir}/sam-translate
 
 %if %{with test}
 %check

serverless-application-model-1.11.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2bf620d1d22ee28781eefe0cb47e121c3f40eab4b04635889936b0ec1847e4f2
-size 5090907

serverless-application-model-1.22.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46b28186bc06ebe116e1e5671afd717a1097e1224adb7e66a20ece46dd4d9079
+size 5092855