Hello community,
here is the log from the commit of package python-Keras for openSUSE:Factory
checked in at 2020-03-07 21:41:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Keras (Old)
and /work/SRC/openSUSE:Factory/.python-Keras.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Keras"
Sat Mar 7 21:41:09 2020 rev:2 rq:779131 version:2.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Keras/python-Keras.changes
2019-12-10 22:46:31.189717929 +0100
+++ /work/SRC/openSUSE:Factory/.python-Keras.new.26092/python-Keras.changes
2020-03-07 21:41:10.424391062 +0100
@@ -1,0 +2,15 @@
+Tue Feb 25 15:14:43 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- Switch to multibuild to really avoid buildcycles
+
+-------------------------------------------------------------------
+Tue Feb 25 11:23:23 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- Exclude 32bit archs as we need to match up with tensorflow
+
+-------------------------------------------------------------------
+Mon Feb 24 13:10:15 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- Fix up the dependencies and enable testing
+
+-------------------------------------------------------------------
New:
----
_multibuild
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Keras.spec ++++++
--- /var/tmp/diff_new_pack.M7TV1Y/_old 2020-03-07 21:41:11.016391463 +0100
+++ /var/tmp/diff_new_pack.M7TV1Y/_new 2020-03-07 21:41:11.020391465 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-Keras
#
-# 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,28 +17,55 @@
%define srcname keras
+# We have only py3 based tensorflow
%define skip_python2 1
-
-Name: python-Keras
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name: python-Keras%{psuffix}
Version: 2.3.1
Release: 0
Summary: Deep Learning library
License: MIT
-Group: Development/Languages/Python
-Url: https://github.com/keras-team/keras
+URL: https://github.com/keras-team/keras
Source:
https://github.com/keras-team/keras/archive/%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
+%if %{with test}
+BuildRequires: %{python_module Keras-Applications >= 1.0.6}
+BuildRequires: %{python_module Keras-Preprocessing >= 1.0.5}
+BuildRequires: %{python_module Markdown}
+BuildRequires: %{python_module Pillow}
+BuildRequires: %{python_module PyYAML}
+BuildRequires: %{python_module Theano}
+BuildRequires: %{python_module flaky}
+BuildRequires: %{python_module numpy >= 1.9.1}
+BuildRequires: %{python_module pandas}
+BuildRequires: %{python_module pydot}
+BuildRequires: %{python_module pytest-xdist}
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module pyux}
+BuildRequires: %{python_module requests}
+BuildRequires: %{python_module scipy >= 0.14}
+BuildRequires: %{python_module six >= 1.9.0}
+BuildRequires: tensorflow
+%endif
BuildRequires: %{python_module setuptools}
-BuildRequires: %{pythons}
-BuildRequires: fdupes
BuildRequires: dos2unix
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: %{python_module Keras-Applications}
-Requires: %{python_module Keras-Preprocessing}
-Requires: %{python_module PyYAML}
-Requires: %{python_module numpy}
-Requires: %{python_module six}
+BuildRequires: fdupes
+# match up with tensorflow
+ExcludeArch: %ix86
+Requires: python-Keras-Applications >= 1.0.6
+Requires: python-Keras-Preprocessing >= 1.0.5
+Requires: python-PyYAML
+Requires: python-numpy >= 1.9.1
+Requires: python-scipy >= 0.14
+Requires: python-six >= 1.9.0
Requires: tensorflow
-Provides: python3-keras = %{version}
+Provides: python-keras = %{version}
%python_subpackages
%description
@@ -58,7 +85,6 @@
%package examples
Summary: High level examples for keras
-Group: Development/Languages/Python
Requires: %{name}
%description examples
@@ -67,30 +93,47 @@
%prep
%setup -q -n %{srcname}-%{version}
+dos2unix examples/*
+
+# we do not ship tensorboard/tensorflow_estimator:
+rm tests/keras/callbacks/tensorboard_test.py
+
+# downloads datasets from AWS:
+rm tests/integration_tests/test_datasets.py
+
+# test_api - needs cntk backend
+rm tests/test_api.py
%build
%python_build
%install
+%if !%{with test}
%python_install
mkdir -p %{buildroot}/%{_docdir}/%{name}/examples/
install -D examples/* %{buildroot}/%{_docdir}/%{name}/examples
-# Keras is used cross platform, so the sources have to be converted
-dos2unix %{buildroot}/%{_docdir}/%{name}/examples/class_activation_maps.py \
- %{buildroot}/%{_docdir}/%{name}/examples/mnist_swwae.py \
- %{buildroot}/%{_docdir}/%{name}/examples/neural_doodle.py \
-
# remove unneeded Keras and doc files
%python_expand rm -r %{buildroot}%{$python_sitelib}/docs
%python_expand %fdupes %{buildroot}%{$python_sitelib}/keras
+%endif
+
+%check
+%if %{with test}
+# test_TensorBoard_with_ReduceLROnPlateau - we don't have tensorboard
+# test_unweighted or test_selu or test_weighted or test_scalar_weighted or
test_sample_weighted - fails numeric calculations, we deviate too much
+%pytest -n auto -k 'not (test_TensorBoard_with_ReduceLROnPlateau or
test_unweighted or test_selu or test_weighted or test_scalar_weighted or
test_sample_weighted)'
+%endif
+%if !%{with test}
%files %{python_files}
-%defattr(-,root,root)
+%license LICENSE
+%doc README.md
%{python_sitelib}/keras
%{python_sitelib}/Keras-*
%files %{python_files examples}
%dir %{_docdir}/%{name}
%{_docdir}/%{name}/examples
+%endif
%changelog
++++++ _multibuild ++++++
<multibuild>
<package>test</package>
</multibuild>
