From c58fe92efaa7c6d1ac758c644f657c434e316d960cb4c31731681c38e266ad91 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 25 Nov 2024 23:25:42 +0000 Subject: [PATCH 1/7] Accepting request 1226079 from home:smolsheep:upgrades - Update to 0.17.1: * Update README and INSTALL docs * Allow linux libdir name to be 'lib64' or 'lib' * Test localised exception with non-ASCII characters - Updates from 0.17.0: * API change: derived classes of BasicIo are omitted from Python. * enableBMFF() function is deprecated. * Documentation is available on https://python-exiv2.readthedocs.io/ - Updates from 0.16.2: * Removed AnyError alias of Exiv2Error exception. * Metadatum.print() method is no longer renamed to _print. * Improved handling of enums: * Enum results are returned as Python enum instead of int. * Passing ints as enum parameters is deprecated. * Added dict-like behaviour to "data" structs. * Log handlers can be set/cleared from Python. * SWIG v4.1.0 or later required to run SWIG. - Updates from 0.16.0: * Include native language support in Windows binary wheel builds. * API change: DateValue.getDate() returns Python dict. * API change: TimeValue.getTime() returns Python dict. * Deprecated: exiv2.Date and exiv2.Time objects. * Added buffer interface to PreviewImage * Set datum value from Python object directly instead of via string. * Moved Position enum to BasicIo class. * Moved CharsetId enum to CommentValue class. * Moved XmpArrayType and XmpStruct enums to XmpValue class. * Added enums for LogMsg.Level * More exiv2 structs are iterable for easy conversion to Python dict. - Updates from 0.15.0: * Added __version_tuple__ for easy runtime version testing. * exiv2.testVersion() can be called from Python. * exiv2.DataBuf can be created from Python data. * Most data() methods return a Python memoryview. * exiv2.DataBuf and exiv2.BasicIo have writeable Python buffer interface. OBS-URL: https://build.opensuse.org/request/show/1226079 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-exiv2?expand=0&rev=26 --- 0.14.1.tar.gz | 3 --- 0.17.1.tar.gz | 3 +++ python-exiv2.changes | 43 +++++++++++++++++++++++++++++++++++++++++++ python-exiv2.spec | 4 ++-- 4 files changed, 48 insertions(+), 5 deletions(-) delete mode 100644 0.14.1.tar.gz create mode 100644 0.17.1.tar.gz diff --git a/0.14.1.tar.gz b/0.14.1.tar.gz deleted file mode 100644 index 2745ecc..0000000 --- a/0.14.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6f63e9343ce12c880f8b8654b94188285e31625b8a4396daac545c7de2b7457 -size 2237216 diff --git a/0.17.1.tar.gz b/0.17.1.tar.gz new file mode 100644 index 0000000..e743c2b --- /dev/null +++ b/0.17.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2984f8832c71dc206edd1dfe9b90b6cef34c9bafa1a8311baa284f8161602ace +size 1621149 diff --git a/python-exiv2.changes b/python-exiv2.changes index 6004761..7006a1d 100644 --- a/python-exiv2.changes +++ b/python-exiv2.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Sun Nov 24 09:33:03 UTC 2024 - Joshua Smith + +- Update to 0.17.1: + * Update README and INSTALL docs + * Allow linux libdir name to be 'lib64' or 'lib' + * Test localised exception with non-ASCII characters +- Updates from 0.17.0: + * API change: derived classes of BasicIo are omitted from Python. + * enableBMFF() function is deprecated. + * Documentation is available on + https://python-exiv2.readthedocs.io/ +- Updates from 0.16.2: + * Removed AnyError alias of Exiv2Error exception. + * Metadatum.print() method is no longer renamed to _print. + * Improved handling of enums: + * Enum results are returned as Python enum instead of int. + * Passing ints as enum parameters is deprecated. + * Added dict-like behaviour to "data" structs. + * Log handlers can be set/cleared from Python. + * SWIG v4.1.0 or later required to run SWIG. +- Updates from 0.16.0: + * Include native language support in Windows binary wheel builds. + * API change: DateValue.getDate() returns Python dict. + * API change: TimeValue.getTime() returns Python dict. + * Deprecated: exiv2.Date and exiv2.Time objects. + * Added buffer interface to PreviewImage + * Set datum value from Python object directly instead of via + string. + * Moved Position enum to BasicIo class. + * Moved CharsetId enum to CommentValue class. + * Moved XmpArrayType and XmpStruct enums to XmpValue class. + * Added enums for LogMsg.Level + * More exiv2 structs are iterable for easy conversion to Python + dict. +- Updates from 0.15.0: + * Added __version_tuple__ for easy runtime version testing. + * exiv2.testVersion() can be called from Python. + * exiv2.DataBuf can be created from Python data. + * Most data() methods return a Python memoryview. + * exiv2.DataBuf and exiv2.BasicIo have writeable Python buffer + interface. + ------------------------------------------------------------------- Wed Oct 11 15:14:43 UTC 2023 - Ondřej Súkup diff --git a/python-exiv2.spec b/python-exiv2.spec index 5d92972..2ef70cb 100644 --- a/python-exiv2.spec +++ b/python-exiv2.spec @@ -1,7 +1,7 @@ # # spec file for package python-exiv2 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-exiv2 -Version: 0.14.1 +Version: 0.17.1 Release: 0 Summary: Python3 bindings for the exiv2 library License: GPL-3.0-only From cb2797368eb3a1476d89f242d3793b71fb29cb5661267695d8437a171aa080cb Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 25 Nov 2024 23:34:41 +0000 Subject: [PATCH 2/7] - Enable tests. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-exiv2?expand=0&rev=27 --- python-exiv2.changes | 5 +++++ python-exiv2.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/python-exiv2.changes b/python-exiv2.changes index 7006a1d..d3e6bb5 100644 --- a/python-exiv2.changes +++ b/python-exiv2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 25 23:34:32 UTC 2024 - Matej Cepl + +- Enable tests. + ------------------------------------------------------------------- Sun Nov 24 09:33:03 UTC 2024 - Joshua Smith diff --git a/python-exiv2.spec b/python-exiv2.spec index 2ef70cb..511861d 100644 --- a/python-exiv2.spec +++ b/python-exiv2.spec @@ -25,6 +25,7 @@ Group: Development/Languages/Python URL: https://launchpad.net/py3exiv2 Source: https://github.com/jim-easterbrook/python-exiv2/archive/refs/tags/%{version}.tar.gz BuildRequires: %{python_module devel} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: gcc-c++ @@ -54,6 +55,9 @@ easy manipulation of image metadata. %python_install %python_expand %fdupes %{buildroot}%{$python_sitearch} +%check +%pytest_arch + %files %{python_files} %{python_sitearch}/exiv2 %{python_sitearch}/exiv2-%{version}*-info From ca0eaf170b042b5297774c5d3aeba671c98fc64e9d73dea141953c836e14e063 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 25 Nov 2024 23:48:43 +0000 Subject: [PATCH 3/7] We actually do not need pytest. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-exiv2?expand=0&rev=28 --- python-exiv2.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-exiv2.spec b/python-exiv2.spec index 511861d..0c7790c 100644 --- a/python-exiv2.spec +++ b/python-exiv2.spec @@ -25,7 +25,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/py3exiv2 Source: https://github.com/jim-easterbrook/python-exiv2/archive/refs/tags/%{version}.tar.gz BuildRequires: %{python_module devel} -BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: gcc-c++ @@ -56,7 +55,7 @@ easy manipulation of image metadata. %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -%pytest_arch +%pyunittest_arch discover -v tests/ %files %{python_files} %{python_sitearch}/exiv2 From daf18d6d7993e89a118865cba3a36f4d6e1d2ad76eed01960f7d7e5017195d0b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 26 Nov 2024 01:54:50 +0000 Subject: [PATCH 4/7] - Fix building. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-exiv2?expand=0&rev=29 --- python-exiv2.changes | 1 + python-exiv2.spec | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-exiv2.changes b/python-exiv2.changes index d3e6bb5..550e863 100644 --- a/python-exiv2.changes +++ b/python-exiv2.changes @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Nov 25 23:34:32 UTC 2024 - Matej Cepl +- Fix building. - Enable tests. ------------------------------------------------------------------- diff --git a/python-exiv2.spec b/python-exiv2.spec index 0c7790c..30e015d 100644 --- a/python-exiv2.spec +++ b/python-exiv2.spec @@ -22,10 +22,12 @@ Release: 0 Summary: Python3 bindings for the exiv2 library License: GPL-3.0-only Group: Development/Languages/Python -URL: https://launchpad.net/py3exiv2 +URL: https://github.com/jim-easterbrook/python-exiv2 Source: https://github.com/jim-easterbrook/python-exiv2/archive/refs/tags/%{version}.tar.gz BuildRequires: %{python_module devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libboost_python3-devel @@ -48,10 +50,10 @@ easy manipulation of image metadata. %autosetup -p1 %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %check From 5ba6440a01b74d5cdff6bdfb9bd45d1126319778282851ee20d8236b9f328097 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 26 Nov 2024 01:58:59 +0000 Subject: [PATCH 5/7] Fix SLE-15 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-exiv2?expand=0&rev=30 --- python-exiv2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-exiv2.spec b/python-exiv2.spec index 30e015d..a35210a 100644 --- a/python-exiv2.spec +++ b/python-exiv2.spec @@ -16,6 +16,7 @@ # +%{?sle15_python_module_pythons} Name: python-exiv2 Version: 0.17.1 Release: 0 From 38c2408a657fb92fa224780c199c99c61d53c548ebce3ba7f8df7f93b130bfaa Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 26 Nov 2024 02:17:11 +0000 Subject: [PATCH 6/7] WIP OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-exiv2?expand=0&rev=31 --- python-exiv2.spec | 4 ++++ skip_network_tests.patch | 14 ++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 skip_network_tests.patch diff --git a/python-exiv2.spec b/python-exiv2.spec index a35210a..250b24b 100644 --- a/python-exiv2.spec +++ b/python-exiv2.spec @@ -25,6 +25,9 @@ License: GPL-3.0-only Group: Development/Languages/Python URL: https://github.com/jim-easterbrook/python-exiv2 Source: https://github.com/jim-easterbrook/python-exiv2/archive/refs/tags/%{version}.tar.gz +# PATCH-FIX-UPSTREAM skip_network_tests.patch bsc#[0-9]+ mcepl@suse.com +# this patch makes things totally awesome +Patch0: skip_network_tests.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} @@ -58,6 +61,7 @@ easy manipulation of image metadata. %python_expand %fdupes %{buildroot}%{$python_sitearch} %check +export NONET=1 %pyunittest_arch discover -v tests/ %files %{python_files} diff --git a/skip_network_tests.patch b/skip_network_tests.patch new file mode 100644 index 0000000..960ab5c --- /dev/null +++ b/skip_network_tests.patch @@ -0,0 +1,14 @@ +--- + tests/test_basicio.py | 1 + + 1 file changed, 1 insertion(+) + +--- a/tests/test_basicio.py ++++ b/tests/test_basicio.py +@@ -33,6 +33,7 @@ class TestBasicIoModule(unittest.TestCas + cls.image_path = os.path.join(test_dir, 'image_02.jpg') + cls.data = b'The quick brown fox jumps over the lazy dog' + ++ @unittest.skipIf('NONET' in os.environ, 'Requires network access') + @unittest.skipUnless(exiv2.versionInfo()['EXV_USE_CURL'], + 'CurlIo not included') + def test_CurlIo(self): From c7ba640d4dfda699eb13f9d707ebc625ff9d11043be55311ce1334b05b135121 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 28 Nov 2024 17:58:42 +0000 Subject: [PATCH 7/7] - Fix building - Enable tests - Add skip_network_tests.patch to mark network-requiring tests and skip them OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-exiv2?expand=0&rev=32 --- python-exiv2.changes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-exiv2.changes b/python-exiv2.changes index 550e863..df16bb2 100644 --- a/python-exiv2.changes +++ b/python-exiv2.changes @@ -1,8 +1,10 @@ ------------------------------------------------------------------- Mon Nov 25 23:34:32 UTC 2024 - Matej Cepl -- Fix building. -- Enable tests. +- Fix building +- Enable tests +- Add skip_network_tests.patch to mark network-requiring tests + and skip them ------------------------------------------------------------------- Sun Nov 24 09:33:03 UTC 2024 - Joshua Smith