Hello community, here is the log from the commit of package python-imagecodecs for openSUSE:Factory checked in at 2020-09-04 11:01:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-imagecodecs (Old) and /work/SRC/openSUSE:Factory/.python-imagecodecs.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-imagecodecs" Fri Sep 4 11:01:06 2020 rev:5 rq:830235 version:2020.5.30 Changes: -------- --- /work/SRC/openSUSE:Factory/python-imagecodecs/python-imagecodecs.changes 2020-05-26 17:49:35.915917138 +0200 +++ /work/SRC/openSUSE:Factory/.python-imagecodecs.new.3399/python-imagecodecs.changes 2020-09-04 11:02:03.754718202 +0200 @@ -1,0 +2,20 @@ +Fri Aug 28 09:20:47 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Switch to multibuild to not cycle + +------------------------------------------------------------------- +Fri Aug 28 08:37:24 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Add patch to enforce cythonization: + * always-cythonize.patch +- Add patch to locate zopfli headers properly: + * zopfli-headers.patch + +------------------------------------------------------------------- +Fri Aug 28 08:20:58 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Update to 2020.5.30: + * pythhon3 only + * add support for more codecs + +------------------------------------------------------------------- Old: ---- imagecodecs-2019.5.22.tar.gz New: ---- _multibuild always-cythonize.patch imagecodecs-2020.5.30.tar.gz zopfli-headers.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-imagecodecs.spec ++++++ --- /var/tmp/diff_new_pack.gg7zwH/_old 2020-09-04 11:02:07.874720410 +0200 +++ /var/tmp/diff_new_pack.gg7zwH/_new 2020-09-04 11:02:07.874720410 +0200 @@ -17,50 +17,71 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif %define skip_python2 1 -Name: python-imagecodecs -Version: 2019.5.22 +Name: python-imagecodecs%{psuffix} +Version: 2020.5.30 Release: 0 Summary: Image transformation, compression, and decompression codecs License: BSD-3-Clause -Group: Development/Languages/Python URL: https://www.lfd.uci.edu/~gohlke/ Source: https://files.pythonhosted.org/packages/source/i/imagecodecs/imagecodecs-%{version}.tar.gz -BuildRequires: %{python_module Cython} +Patch0: always-cythonize.patch +Patch1: zopfli-headers.patch +BuildRequires: %{python_module Cython >= 0.29.19} +BuildRequires: %{python_module numpy-devel >= 1.15.1} +BuildRequires: %{python_module setuptools >= 18.0} +BuildRequires: dos2unix +BuildRequires: fdupes +Requires: python-numpy >= 1.15.1 +Requires(post): update-alternatives +Requires(postun): update-alternatives +Recommends: python-Pillow +Recommends: python-blosc +Recommends: python-lz4 +Recommends: python-matplotlib >= 3.1 +Recommends: python-tifffile >= 2020.5.25 +Recommends: python-zstd +%if %{with test} BuildRequires: %{python_module Pillow} BuildRequires: %{python_module blosc} +BuildRequires: %{python_module imagecodecs >= %{version}} BuildRequires: %{python_module lz4} -BuildRequires: %{python_module matplotlib >= 2.2} -BuildRequires: %{python_module numpy-devel >= 1.11.3} +BuildRequires: %{python_module matplotlib >= 3.1} BuildRequires: %{python_module pytest} BuildRequires: %{python_module scikit-image} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module tifffile >= 2020.5.25} BuildRequires: %{python_module zstd} -BuildRequires: dos2unix -BuildRequires: fdupes +%else BuildRequires: gcc-c++ +BuildRequires: giflib-devel BuildRequires: jxrlib-devel -BuildRequires: libjpeg62-devel +BuildRequires: libaec-devel +BuildRequires: libzopfli-devel BuildRequires: pkgconfig BuildRequires: python-rpm-macros +BuildRequires: snappy-devel BuildRequires: pkgconfig(blosc) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libbrotlicommon) +BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(zlib) -Requires: python-numpy >= 1.11.3 -Requires(post): update-alternatives -Requires(postun): update-alternatives -Recommends: python-Pillow -Recommends: python-blosc -Recommends: python-lz4 -Recommends: python-matplotlib >= 2.2 -Recommends: python-zstd +%endif %python_subpackages %description @@ -75,28 +96,35 @@ %prep %setup -q -n imagecodecs-%{version} +%autopatch -p1 + dos2unix README.rst -# prevent ImportError in CLI due to missing tifffile -sed -i '/from tifffile import imshow/d' imagecodecs/__main__.py %build +%if !%{with test} export CFLAGS="%{optflags}" %python_build +%endif %install +%if !%{with test} %python_install %python_clone -a %{buildroot}%{_bindir}/imagecodecs %{python_expand rm -rf %{buildroot}%{$python_sitearch}/imagecodecs/licenses/ %fdupes %{buildroot}%{$python_sitearch} } +%endif %check +%if %{with test} mv imagecodecs __imagecodecs # Should add --doctest-modules %%{buildroot}%%{$python_sitearch}/imagecodecs/imagecodecs.py # however doctests are currently broken %pytest_arch tests mv __imagecodecs imagecodecs +%endif +%if !%{with test} %post %python_install_alternative imagecodecs @@ -108,5 +136,6 @@ %doc README.rst %python_alternative %{_bindir}/imagecodecs %{python_sitearch}/* +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild> ++++++ always-cythonize.patch ++++++ Index: imagecodecs-2020.5.30/setup.py =================================================================== --- imagecodecs-2020.5.30.orig/setup.py +++ imagecodecs-2020.5.30/setup.py @@ -71,7 +71,7 @@ if 'sdist' in sys.argv: OPTIONS = { - 'cythonize': sys.version_info >= (3, 10), + 'cythonize': True, 'include_dirs': ['imagecodecs'], 'library_dirs': [], 'libraries': ['m'] if sys.platform != 'win32' else [], ++++++ imagecodecs-2019.5.22.tar.gz -> imagecodecs-2020.5.30.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-imagecodecs/imagecodecs-2019.5.22.tar.gz /work/SRC/openSUSE:Factory/.python-imagecodecs.new.3399/imagecodecs-2020.5.30.tar.gz differ: char 5, line 1 ++++++ zopfli-headers.patch ++++++ Index: imagecodecs-2020.5.30/imagecodecs/zopfli.pxd =================================================================== --- imagecodecs-2020.5.30.orig/imagecodecs/zopfli.pxd +++ imagecodecs-2020.5.30/imagecodecs/zopfli.pxd @@ -4,7 +4,7 @@ # Cython declarations for the `Zopfli 1.0.3` library. # https://github.com/google/zopfli -cdef extern from 'zopfli/zopfli.h': +cdef extern from 'zopfli.h': ctypedef struct ZopfliOptions: int verbose
