Merge pull request #59 from jim-easterbrook/devel

Devel

Author: jim-easterbrook

.github/workflows/build-exiv2-wheels-prebuilt.yml

@@ -30,7 +30,7 @@ jobs:
       run:
         shell: bash
     env:
-      EXIV2_VSN: 0.28.7
+      EXIV2_VSN: 0.28.8
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4

.github/workflows/build-exiv2-wheels.yml

@@ -25,7 +25,7 @@ jobs:
             wget: c:/msys64/usr/bin/wget.exe
     env:
       EXIV2_SRC: >
-        https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.7.tar.gz
+        https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.8.tar.gz
       EXIV2_OPTIONS: >
         -D EXIV2_BUILD_EXIV2_COMMAND=OFF
         -D EXIV2_BUILD_SAMPLES=OFF

CHANGELOG.txt

@@ -1,6 +1,6 @@
 python-exiv2 - Python interface to libexiv2
 http://github.com/jim-easterbrook/python-exiv2
-Copyright (C) 2022-25  Jim Easterbrook  jim@jim-easterbrook.me.uk
+Copyright (C) 2022-26  Jim Easterbrook  jim@jim-easterbrook.me.uk
 
 This program is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -16,6 +16,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see
 <http://www.gnu.org/licenses/>.
 
+Changes in v0.18.1:
+  1/ Binary wheels incorporate libexiv2 v0.28.8
+
 Changes in v0.18.0:
   1/ Removed features deprecated in v0.13.0:
      Value (and derived types) copy constructors

README.rst

@@ -1,4 +1,4 @@
-python-exiv2 v\ 0.18.0
+python-exiv2 v\ 0.18.1
 ======================
 
 python-exiv2 is a low level interface (or binding) to the exiv2_ C++ library.

src/doc/conf.py

@@ -65,10 +65,10 @@
     'undoc-members': True,
     'special-members': True,
     'exclude-members': ','.join((
-        'this', 'thisown', '__dict__', '__eq__', '__format__',
-        '__getattribute__', '__ge__', '__gt__', '__hash__', '__init__',
-        '__le__', '__lt__', '__module__ ', '__new__', '__ne__', '__repr__',
-        '__str__', '__weakref__')),
+        'this', 'thisown', '__annotations__ ', '__dict__', '__eq__',
+        '__format__', '__getattribute__', '__ge__', '__gt__', '__hash__',
+        '__init__', '__le__', '__lt__', '__module__ ', '__new__', '__ne__',
+        '__repr__', '__str__', '__weakref__')),
     'show-inheritance': True,
     }
 
@@ -91,10 +91,10 @@ def process_docstring(app, what, name, obj, options, lines):
     if name == 'exiv2._version.__version_tuple__':
         lines[:] = ['python-exiv2 version as a tuple of ints', '']
         return
-    if 'iterator' in name and not lines:
+    if 'pointer' in name and not lines:
         parts = name.split('.')
         lines[:] = ['See :meth:`{}.{}`.'.format(parts[2].replace(
-            'Data_iterator', 'datum'), parts[3]), '']
+            'datum_pointer', 'datum'), parts[3]), '']
         return
     # fixes for particular problems
     if name.endswith('iptc.Iptcdatum'):
@@ -120,14 +120,10 @@ def process_docstring(app, what, name, obj, options, lines):
         for idx in range(len(lines)):
             lines[idx] = lines[idx].replace(
                 'Exif.%Thumbnail.*', '``Exif.Thumbnail.*``')
-    if name.endswith('Io.read'):
-        # fix size_ member
-        for idx in range(len(lines)):
-            lines[idx] = lines[idx].replace('DataBuf::size_', 'DataBuf.size\_')
     if name.endswith('XmpData.usePacket'):
         # fix usepacket_ member
         for idx in range(len(lines)):
-            lines[idx] = lines[idx].replace('usePacket_', 'usePacket\_')
+            lines[idx] = lines[idx].replace('usePacket_', r'usePacket\_')
     # other substitutions
     for idx in range(len(lines)):
         line = lines[idx]

src/doc/requirements.txt

@@ -1,4 +1,4 @@
-exiv2 == 0.18.0
+exiv2 == 0.18.1
 sphinx == 8.2.3
 sphinx-rtd-theme == 3.0.2
 enum_tools[sphinx] >= 0.13