Hello community,
here is the log from the commit of package python-cfn-lint for openSUSE:Factory
checked in at 2020-05-09 19:52:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cfn-lint (Old)
and /work/SRC/openSUSE:Factory/.python-cfn-lint.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cfn-lint"
Sat May 9 19:52:21 2020 rev:3 rq:800033 version:0.30.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cfn-lint/python-cfn-lint.changes
2019-09-07 11:50:17.278300835 +0200
+++
/work/SRC/openSUSE:Factory/.python-cfn-lint.new.2738/python-cfn-lint.changes
2020-05-09 19:52:29.352855246 +0200
@@ -1,0 +2,18 @@
+Mon May 4 07:38:02 UTC 2020 - Tomáš Chvátal <[email protected]>
+
+- Update to 0.30.1:
+ * Fix many various issues and support new regions
+- Drop merged patches:
+ * cl_drop-compatible-releases-operator.patch
+ * cl_fix-config-expand-paths-test.patch
+ * cl_fix-lambda-runtimes-EOL-dates.patch
+
+-------------------------------------------------------------------
+Mon May 4 07:33:44 UTC 2020 - Tomáš Chvátal <[email protected]>
+
+- Fix build without python2
+- Fix cfn-lint subpackage by moving it back to the python*-cfn-lint
+ it is setuptools entrypoint, no reason to split it out
+ * use update-alternatives to switch between binaries
+
+-------------------------------------------------------------------
Old:
----
cfn-python-lint-0.21.4.tar.gz
cl_drop-compatible-releases-operator.patch
cl_fix-config-expand-paths-test.patch
cl_fix-lambda-runtimes-EOL-dates.patch
New:
----
cfn-python-lint-0.30.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cfn-lint.spec ++++++
--- /var/tmp/diff_new_pack.NEunnM/_old 2020-05-09 19:52:30.448857599 +0200
+++ /var/tmp/diff_new_pack.NEunnM/_new 2020-05-09 19:52:30.452857608 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-cfn-lint
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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
@@ -17,48 +17,53 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without python2
Name: python-cfn-lint
-Version: 0.21.4
+Version: 0.30.1
Release: 0
Summary: Tool to checks cloudformation for practices and behaviour
License: MIT
-Group: Development/Languages/Python
URL: https://github.com/aws-cloudformation/cfn-python-lint
Source:
https://github.com/aws-cloudformation/cfn-python-lint/archive/v%{version}.tar.gz#/cfn-python-lint-%{version}.tar.gz
-Patch0: cl_drop-compatible-releases-operator.patch
-Patch1: cl_fix-lambda-runtimes-EOL-dates.patch
-Patch2: cl_fix-config-expand-paths-test.patch
-%if 0%{?suse_version} < 1500
-BuildRequires: python
-%endif
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-PyYAML
-Requires: python-aws-sam-translator >= 1.10.0
+Requires: python-aws-sam-translator >= 1.21.0
+Requires: python-importlib_resources >= 1.0.2
Requires: python-jsonpatch
-Requires: python-jsonschema > 2.6
+Requires: python-jsonschema > 3.0
+Requires: python-networkx >= 2.2
Requires: python-requests >= 2.15.0
-Requires: python-six > 1.11
+Requires: python-six >= 1.11
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+Recommends: python-pydot
+Provides: cfn-lint = %{version}
+Obsoletes: cfn-lint < %{version}
BuildArch: noarch
+%if 0%{?suse_version} < 1500
+BuildRequires: python
+%endif
# SECTION test requirements
BuildRequires: %{python_module PyYAML}
-BuildRequires: %{python_module aws-sam-translator >= 1.10.0}
+BuildRequires: %{python_module aws-sam-translator >= 1.21.0}
+BuildRequires: %{python_module importlib_resources >= 1.0.2}
BuildRequires: %{python_module jsonpatch}
-BuildRequires: %{python_module jsonschema > 2.6}
+BuildRequires: %{python_module jsonschema > 3.0}
BuildRequires: %{python_module mock}
+BuildRequires: %{python_module networkx >= 2.2}
+BuildRequires: %{python_module pydot}
BuildRequires: %{python_module requests >= 2.15.0}
-BuildRequires: %{python_module six > 1.11}
+BuildRequires: %{python_module six >= 1.11}
BuildRequires: bash
-BuildRequires: python-enum34 >= 1.1
+%if %{with python2}
BuildRequires: python-pathlib2 >= 2.3.0
+%endif
# /SECTION
%ifpython2
Requires: python-pathlib2 >= 2.3.0
%endif
-%ifpython3
-Requires: cfn-lint = %{version}
-%endif
%python_subpackages
%description
@@ -66,24 +71,10 @@
spec and additional checks. Includes checking valid values for
resource properties and best practices.
-# This is primarily a command-line tool, but some packages, like python-moto
-# make use of the python API it provides
-
-%package -n cfn-lint
-Summary: Tool to checks cloudformation for practices and behaviour
-Group: Development/Tools/Other
-Requires: python3-cfn-lint
-
-%description -n cfn-lint
-Validate CloudFormation yaml/json templates against the CloudFormation
-spec and additional checks. Includes checking valid values for
-resource properties and best practices.
-
%prep
%setup -q -n cfn-python-lint-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+# do not hardcode versions
+sed -i -e 's:~=:>=:g' setup.py
%build
%python_build
@@ -91,19 +82,31 @@
%install
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%python_clone -a %{buildroot}%{_bindir}/cfn-lint
+
+%post
+%python_install_alternative cfn-lint
+
+%postun
+%python_uninstall_alternative cfn-lint
%check
export LANG=en_US.UTF-8
export AWS_DEFAULT_REGION=us-east-1
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m unittest
discover -s test
+
+# This is just faking as we use update-alternatives and don't have cfn-lint
binary around during build
+mkdir bin
+pushd bin
+ln -s %{buildroot}%{_bindir}/cfn-lint-%{python3_bin_suffix} ./cfn-lint
+popd
+export PATH="./bin:$PATH"
+
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m unittest
discover -s test -v
%files %{python_files}
%doc CHANGELOG.md README.md
%license LICENSE
%{python_sitelib}/*
-
-%files -n cfn-lint
-%license LICENSE
-%{_bindir}/cfn-lint
+%python_alternative %{_bindir}/cfn-lint
%changelog
++++++ cfn-python-lint-0.21.4.tar.gz -> cfn-python-lint-0.30.1.tar.gz ++++++
++++ 729309 lines of diff (skipped)
