Merge pull request #30 from jim-easterbrook/v0.16

V0.16

Author: jim-easterbrook

.github/workflows/build-linux-27.yml

@@ -21,7 +21,7 @@ jobs:
           mv exiv2-0.27.7-Source libexiv2
 
       - name: Build wheels
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].5
         env:
           CIBW_ARCHS: auto64
           CIBW_ENVIRONMENT: EXIV2_ROOT=libexiv2/build-linux/install

.github/workflows/build-linux-28.yml

@@ -11,22 +11,27 @@ jobs:
       - name: Fetch Exiv2 source
         run: >
           wget -nv
-          https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.1.tar.gz
+          https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.2.tar.gz
           -O exiv2.tar.gz
 
       - name: Extract Exiv2 source
         run: |
           tar -xzf exiv2.tar.gz
-          mv exiv2-0.28.1 libexiv2
+          mv exiv2-0.28.2 libexiv2
 
       - name: Download inih
         run: >
           wget -nv
-          https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/i/inih-57-1.el8.x86_64.rpm
-          https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/i/inih-devel-57-1.el8.x86_64.rpm
+          https://github.com/benhoyt/inih/archive/r58/inih-r58.tar.gz
+          -O inih.tar.gz
+
+      - name: Extract inih source
+        run: |
+          tar -xzf inih.tar.gz
+          mv inih-r58 inih
 
       - name: Build wheels
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].5
         env:
           CIBW_ARCHS: auto64
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
@@ -36,13 +41,14 @@ jobs:
             python3 -m exiv2 -v &&
             python3 -m unittest discover {project}/tests -v
           CIBW_BEFORE_ALL: >
-            yum install -y zlib-devel expat-devel gettext-devel
-            libcurl-devel libssh-devel brotli-devel &&
-            rpm -Uvh inih*.rpm &&
-            dnf install inih inih-devel &&
+            yum install -y --nogpgcheck zlib-devel expat-devel gettext-devel
+            libcurl-devel libssh-devel brotli-devel meson &&
             localedef -c -i de_DE -f UTF-8 de_DE.UTF-8 &&
             pip install ninja &&
-            cd libexiv2 &&
+            cd inih && mkdir build && cd build &&
+            meson setup --prefix=/usr --buildtype=release .. &&
+            ninja && ninja install &&
+            cd ../../libexiv2 &&
             cmake --preset linux-release
             -D CONAN_AUTO_INSTALL=OFF
             -D EXIV2_BUILD_SAMPLES=OFF

.github/workflows/build-macos-27.yml

@@ -21,7 +21,7 @@ jobs:
           mv exiv2-0.27.7-Source libexiv2
 
       - name: Build wheels
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].5
         env:
           CIBW_ARCHS: x86_64
           CIBW_ENVIRONMENT: EXIV2_ROOT=libexiv2/build-macos/install

.github/workflows/build-macos-28.yml

@@ -11,17 +11,17 @@ jobs:
       - name: Fetch Exiv2 source
         run: >
           wget -nv
-          https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.1.tar.gz
+          https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.2.tar.gz
           -O exiv2.tar.gz
 
       - name: Extract Exiv2 source
         shell: bash
         run: |
           tar -xzf exiv2.tar.gz
-          mv exiv2-0.28.1 libexiv2
+          mv exiv2-0.28.2 libexiv2
 
       - name: Build wheels
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].5
         env:
           CIBW_ARCHS: x86_64
           CIBW_ENVIRONMENT: >

.github/workflows/build-macos-arm-27.yml

@@ -24,7 +24,7 @@ jobs:
         run: pip install pipx
 
       - name: Build wheels
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].5
         env:
           CIBW_ARCHS: arm64
           CIBW_ENVIRONMENT: EXIV2_ROOT=libexiv2/build-macos/install

.github/workflows/build-macos-arm-28.yml

@@ -11,20 +11,20 @@ jobs:
       - name: Fetch Exiv2 source
         run: >
           wget -nv
-          https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.1.tar.gz
+          https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.2.tar.gz
           -O exiv2.tar.gz
 
       - name: Extract Exiv2 source
         shell: bash
         run: |
           tar -xzf exiv2.tar.gz
-          mv exiv2-0.28.1 libexiv2
+          mv exiv2-0.28.2 libexiv2
 
       - name: Install pipx
         run: pip install pipx
 
       - name: Build wheels
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].5
         env:
           CIBW_ARCHS: arm64
           CIBW_ENVIRONMENT: >

.github/workflows/build-windows-27.yml

@@ -38,7 +38,7 @@ jobs:
           c:/msys64/usr/bin/patch.exe libexiv2/conanfile.py
 
       - name: Build wheels
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].5
         env:
           CIBW_ARCHS: auto64
           CIBW_SKIP: pp3*

.github/workflows/build-windows-28.yml

@@ -24,20 +24,20 @@ jobs:
       - name: Fetch Exiv2 source
         run: >
           c:\msys64\usr\bin\wget.exe -nv
-          https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.1.tar.gz
+          https://github.com/Exiv2/exiv2/archive/refs/tags/v0.28.2.tar.gz
           -O exiv2.tar.gz
 
       - name: Extract Exiv2 source
         shell: bash
         run: |
           tar -xzf exiv2.tar.gz
-          mv exiv2-0.28.1 libexiv2
+          mv exiv2-0.28.2 libexiv2
           # tweaks to allow NLS
           echo -e "24a25\n>         self.requires('libgettext/0.21')" |
           c:/msys64/usr/bin/patch.exe libexiv2/conanfile.py
 
       - name: Build wheels
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].5
         env:
           CIBW_ARCHS: auto64
           CIBW_SKIP: pp3*

.gitignore

@@ -1,4 +1,6 @@
-build
-dist
+/build
+/doc
+/dist
+/src/doc/api
 exiv2.egg-info
 __pycache__

.readthedocs.yaml

@@ -0,0 +1,19 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: src/doc/conf.py
+
+python:
+  install:
+    - requirements: src/doc/requirements.txt