From 9488f3439b5250f63a04be5cccd3124e2ffe3b12b93486523d5fa9f1bcc6ef87 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 2 Feb 2021 00:09:38 +0000 Subject: [PATCH] Accepting request 868482 from home:bnavigator:branches:devel:languages:python - Update to version 2021.1.28 * Add option to return JPEG XR fixed point pixel types as integers * Add LJPEG codec via liblj92 (alternative to JPEGSOF3 codec) * Change zopfli header location. - refresh always-cythonize.patch - drop zopfli-headers.patch fixed upstream - Add more testing requirements to test backends - Add skip reporting to pytest to see what is still missing OBS-URL: https://build.opensuse.org/request/show/868482 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-imagecodecs?expand=0&rev=13 --- always-cythonize.patch | 10 +++++----- imagecodecs-2021.1.11.tar.gz | 3 --- imagecodecs-2021.1.28.tar.gz | 3 +++ python-imagecodecs.changes | 13 +++++++++++++ python-imagecodecs.spec | 18 +++++++++++------- zopfli-headers.patch | 12 ------------ 6 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 imagecodecs-2021.1.11.tar.gz create mode 100644 imagecodecs-2021.1.28.tar.gz delete mode 100644 zopfli-headers.patch diff --git a/always-cythonize.patch b/always-cythonize.patch index f27ca82..f4be0de 100644 --- a/always-cythonize.patch +++ b/always-cythonize.patch @@ -1,8 +1,8 @@ -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: +Index: imagecodecs-2021.1.28/setup.py +=================================================================== +--- imagecodecs-2021.1.28.orig/setup.py ++++ imagecodecs-2021.1.28/setup.py +@@ -105,7 +105,7 @@ def ext(**kwargs): OPTIONS = { diff --git a/imagecodecs-2021.1.11.tar.gz b/imagecodecs-2021.1.11.tar.gz deleted file mode 100644 index cb2c784..0000000 --- a/imagecodecs-2021.1.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a52cf0368055dc9b1f98948deb245e2bbf23b40b74c8a03226a2d9044470754 -size 5256206 diff --git a/imagecodecs-2021.1.28.tar.gz b/imagecodecs-2021.1.28.tar.gz new file mode 100644 index 0000000..282b199 --- /dev/null +++ b/imagecodecs-2021.1.28.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:798f478f0f6c39444961ddc7acab15c13b6bec2fb2306ba806d9dc753da7dd00 +size 9416868 diff --git a/python-imagecodecs.changes b/python-imagecodecs.changes index 3df3d42..066c6ac 100644 --- a/python-imagecodecs.changes +++ b/python-imagecodecs.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Feb 1 19:40:15 UTC 2021 - Ben Greiner + +- Update to version 2021.1.28 + * Add option to return JPEG XR fixed point pixel types as + integers + * Add LJPEG codec via liblj92 (alternative to JPEGSOF3 codec) + * Change zopfli header location. +- refresh always-cythonize.patch +- drop zopfli-headers.patch fixed upstream +- Add more testing requirements to test backends +- Add skip reporting to pytest to see what is still missing + ------------------------------------------------------------------- Tue Jan 12 21:54:10 UTC 2021 - andy great diff --git a/python-imagecodecs.spec b/python-imagecodecs.spec index 407c308..a51a315 100644 --- a/python-imagecodecs.spec +++ b/python-imagecodecs.spec @@ -28,19 +28,19 @@ %define skip_python2 1 %define skip_python36 1 Name: python-imagecodecs%{psuffix} -Version: 2021.1.11 +Version: 2021.1.28 Release: 0 Summary: Image transformation, compression, and decompression codecs License: BSD-3-Clause URL: https://www.lfd.uci.edu/~gohlke/ Source: https://files.pythonhosted.org/packages/source/i/imagecodecs/imagecodecs-%{version}.tar.gz 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 +BuildRequires: python-rpm-macros Requires: python-numpy >= 1.15.1 Requires(post): update-alternatives Requires(postun): update-alternatives @@ -51,15 +51,22 @@ Recommends: python-matplotlib >= 3.1 Recommends: python-tifffile >= 2020.5.25 Recommends: python-zstd %if %{with test} +BuildRequires: %{python_module Brotli} BuildRequires: %{python_module Pillow} BuildRequires: %{python_module blosc} +BuildRequires: %{python_module czifile} BuildRequires: %{python_module imagecodecs >= %{version}} BuildRequires: %{python_module lz4} BuildRequires: %{python_module matplotlib >= 3.1} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module python-snappy} BuildRequires: %{python_module scikit-image} BuildRequires: %{python_module tifffile >= 2020.5.25} BuildRequires: %{python_module zstd} +# not (yet) available: +#BuildRequires: %%{python_module bitshuffle} +#BuildRequires: %%{python_module lzf} +#BuildRequires: %%{python_module zopflipy} %else BuildRequires: gcc-c++ BuildRequires: giflib-devel @@ -68,7 +75,6 @@ BuildRequires: libaec-devel BuildRequires: libdeflate-devel BuildRequires: libzopfli-devel BuildRequires: pkgconfig -BuildRequires: python-rpm-macros BuildRequires: snappy-devel BuildRequires: pkgconfig(blosc) BuildRequires: pkgconfig(bzip2) @@ -119,11 +125,9 @@ export CFLAGS="%{optflags}" %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 +%pytest_arch tests -rs --import-mode append %endif %if !%{with test} @@ -137,7 +141,7 @@ mv __imagecodecs imagecodecs %license LICENSE imagecodecs/licenses/* %doc README.rst %python_alternative %{_bindir}/imagecodecs -%{python_sitearch}/imagecodecs*.egg-info +%{python_sitearch}/imagecodecs-%{version}*-info %{python_sitearch}/imagecodecs %endif diff --git a/zopfli-headers.patch b/zopfli-headers.patch deleted file mode 100644 index 08d3e27..0000000 --- a/zopfli-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN a/imagecodecs/zopfli.pxd b/imagecodecs/zopfli.pxd ---- a/imagecodecs/zopfli.pxd 2021-01-12 11:06:22.000000000 +0700 -+++ b/imagecodecs/zopfli.pxd 2021-01-13 05:00:24.579533263 +0700 -@@ -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