Skip to content

Commit 4236a29

Browse files
LeoHsiao1LeoHsiao1
authored
Merge pull request #172 from LeoHsiao1/dev
Ready to release v2.15.5
2 parents b0aa296 + f353918 commit 4236a29

File tree

9 files changed

+36
-36
lines changed

9 files changed

+36
-36
lines changed

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
workflow_dispatch:
1010
inputs:
1111
exiv2_version:
12-
default: 0.28.5
12+
default: 0.28.7
1313

1414
jobs:
1515
on_linux:
@@ -20,8 +20,8 @@ jobs:
2020
- { os: ubuntu-22.04, exiv2_platform_name: Linux-x86_64 }
2121
- { os: ubuntu-22.04-arm, exiv2_platform_name: Linux-aarch64 }
2222
exiv2_version:
23-
- ${{ inputs.EXIV2_VERSION || '0.28.5' }}
24-
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
23+
- ${{ inputs.EXIV2_VERSION || '0.28.7' }}
24+
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
2525
runs-on: ${{ matrix.runner.os }}
2626
env:
2727
PLATFORM_NAME: ${{matrix.runner.exiv2_platform_name}}
@@ -89,8 +89,8 @@ jobs:
8989
- { os: macos-13, exiv2_platform_name: Darwin-x86_64 }
9090
- { os: macos-14, exiv2_platform_name: Darwin-arm64 }
9191
exiv2_version:
92-
- ${{ inputs.EXIV2_VERSION || '0.28.5' }}
93-
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
92+
- ${{ inputs.EXIV2_VERSION || '0.28.7' }}
93+
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
9494
runs-on: ${{ matrix.runner.os }}
9595
env:
9696
PLATFORM_NAME: ${{matrix.runner.exiv2_platform_name}}
@@ -158,8 +158,8 @@ jobs:
158158
runner:
159159
- { os: windows-2022, exiv2_platform_name: 2022msvc-AMD64 }
160160
exiv2_version:
161-
- ${{ inputs.EXIV2_VERSION || '0.28.5' }}
162-
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
161+
- ${{ inputs.EXIV2_VERSION || '0.28.7' }}
162+
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
163163
runs-on: ${{ matrix.runner.os }}
164164
env:
165165
PLATFORM_NAME: ${{matrix.runner.exiv2_platform_name}}

‎.github/workflows/test_wheels.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99
inputs:
1010
pyexiv2_version:
11-
default: 2.15.4
11+
default: 2.15.5
1212

1313
jobs:
1414
on_linux:
@@ -18,7 +18,7 @@ jobs:
1818
runner:
1919
- { os: ubuntu-22.04, exiv2_platform_name: Linux-x86_64 }
2020
- { os: ubuntu-22.04-arm, exiv2_platform_name: Linux-aarch64 }
21-
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
21+
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
2222
runs-on: ${{ matrix.runner.os }}
2323
steps:
2424
- uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
4343
runner:
4444
- { os: macos-13, exiv2_platform_name: Darwin-x86_64 }
4545
- { os: macos-14, exiv2_platform_name: Darwin-arm64 }
46-
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
46+
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
4747
runs-on: ${{ matrix.runner.os }}
4848
steps:
4949
- uses: actions/checkout@v4
@@ -68,7 +68,7 @@ jobs:
6868
matrix:
6969
runner:
7070
- { os: windows-2022, exiv2_platform_name: 2022msvc-AMD64 }
71-
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
71+
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
7272
runs-on: ${{ matrix.runner.os }}
7373
steps:
7474
- uses: actions/checkout@v4

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule ".github/exiv2"]
22
path = .github/exiv2
33
url = https://github.com/Exiv2/exiv2.git
4-
branch = v0.28.5
4+
branch = v0.28.7

‎docs/Tutorial-cn.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ def convert_iptc_to_xmp(data: dict, encoding='utf-8') -> dict
113113
def convert_xmp_to_exif(data: dict, encoding='utf-8') -> dict
114114
def convert_xmp_to_iptc(data: dict, encoding='utf-8') -> dict
115115

116-
__version__ = '2.15.4'
117-
__exiv2_version__ = '0.28.5'
116+
__version__ = '2.15.5'
117+
__exiv2_version__ = '0.28.7'
118118
```
119119

120120
## class Image
@@ -338,7 +338,7 @@ __exiv2_version__ = '0.28.5'
338338

339339
## convert
340340

341-
- Exiv2 支持将某些 EXIF 或 IPTC 标签，转换成 XMP 标签，也支持反向转换。参考：<https://github.com/Exiv2/exiv2/blob/v0.28.5/src/convert.cpp#L313>
341+
- Exiv2 支持将某些 EXIF 或 IPTC 标签，转换成 XMP 标签，也支持反向转换。参考：<https://github.com/Exiv2/exiv2/blob/v0.28.7/src/convert.cpp#L313>
342342
- 示例：
343343
```py
344344
>>> pyexiv2.convert_exif_to_xmp({'Exif.Image.Artist': 'test-中文-', 'Exif.Image.Rating': '4'})

‎docs/Tutorial.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ def convert_iptc_to_xmp(data: dict, encoding='utf-8') -> dict
113113
def convert_xmp_to_exif(data: dict, encoding='utf-8') -> dict
114114
def convert_xmp_to_iptc(data: dict, encoding='utf-8') -> dict
115115

116-
__version__ = '2.15.4'
117-
__exiv2_version__ = '0.28.5'
116+
__version__ = '2.15.5'
117+
__exiv2_version__ = '0.28.7'
118118
```
119119

120120
## class Image
@@ -338,7 +338,7 @@ __exiv2_version__ = '0.28.5'
338338

339339
## convert
340340

341-
- Exiv2 supports converting some EXIF or IPTC tags to XMP tags, and also supports reverse conversion. Reference: <https://github.com/Exiv2/exiv2/blob/v0.28.5/src/convert.cpp#L313>
341+
- Exiv2 supports converting some EXIF or IPTC tags to XMP tags, and also supports reverse conversion. Reference: <https://github.com/Exiv2/exiv2/blob/v0.28.7/src/convert.cpp#L313>
342342
- For example:
343343
```py
344344
>>> pyexiv2.convert_exif_to_xmp({'Exif.Image.Artist': 'test-中文-', 'Exif.Image.Rating': '4'})

‎pyexiv2/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from .core import *
77

88

9-
__version__ = '2.15.4'
9+
__version__ = '2.15.5'
1010
__exiv2_version__ = exiv2api.version()
1111

1212

‎pyexiv2/lib/README.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525

2626
## Compile steps on Linux
2727

28-
1. Download [the release of Exiv2](https://github.com/Exiv2/exiv2/releases/tag/v0.28.5) :
28+
1. Download [the release of Exiv2](https://github.com/Exiv2/exiv2/releases/tag/v0.28.7) :
2929
```sh
30-
curl -O https://github.com/Exiv2/exiv2/releases/download/v0.28.5/exiv2-0.28.5-Linux-x86_64.tar.gz
31-
tar -zxvf exiv2-0.28.5-Linux-x86_64.tar.gz
30+
curl -O https://github.com/Exiv2/exiv2/releases/download/v0.28.7/exiv2-0.28.7-Linux-x86_64.tar.gz
31+
tar -zxvf exiv2-0.28.7-Linux-x86_64.tar.gz
3232
```
3333

3434
2. Prepare environment variables according to your download path:
3535
```sh
36-
EXIV2_DIR=??/exiv2-0.28.5-Linux-x86_64
36+
EXIV2_DIR=??/exiv2-0.28.7-Linux-x86_64
3737
LIB_DIR=??/pyexiv2/lib/
38-
cp $EXIV2_DIR/lib/libexiv2.so.0.28.5 $EXIV2_DIR/lib/libexiv2.so
39-
cp $EXIV2_DIR/lib/libexiv2.so.0.28.5 $LIB_DIR/libexiv2.so
38+
cp $EXIV2_DIR/lib/libexiv2.so.0.28.7 $EXIV2_DIR/lib/libexiv2.so
39+
cp $EXIV2_DIR/lib/libexiv2.so.0.28.7 $LIB_DIR/libexiv2.so
4040
```
4141

4242
3. Prepare the python interpreter:
@@ -59,17 +59,17 @@
5959

6060
## Compile steps on Darwin
6161

62-
1. Download [the release of Exiv2](https://github.com/Exiv2/exiv2/releases/tag/v0.28.5) :
62+
1. Download [the release of Exiv2](https://github.com/Exiv2/exiv2/releases/tag/v0.28.7) :
6363
```sh
64-
curl -O https://github.com/Exiv2/exiv2/releases/download/v0.28.5/exiv2-0.28.5-Darwin-x86_64.tar.gz
65-
tar -zxvf exiv2-0.28.5-Darwin-x86_64.tar.gz
64+
curl -O https://github.com/Exiv2/exiv2/releases/download/v0.28.7/exiv2-0.28.7-Darwin-x86_64.tar.gz
65+
tar -zxvf exiv2-0.28.7-Darwin-x86_64.tar.gz
6666
```
6767

6868
2. Prepare environment variables according to your download path:
6969
```sh
70-
EXIV2_DIR=??/exiv2-0.28.5-Darwin-x86_64
70+
EXIV2_DIR=??/exiv2-0.28.7-Darwin-x86_64
7171
LIB_DIR=??/pyexiv2/lib
72-
cp ${EXIV2_DIR}/lib/libexiv2.0.28.5.dylib ${LIB_DIR}/libexiv2.dylib
72+
cp ${EXIV2_DIR}/lib/libexiv2.0.28.7.dylib ${LIB_DIR}/libexiv2.dylib
7373
```
7474

7575
3. Prepare the python interpreter:
@@ -93,18 +93,18 @@
9393

9494
## Compile steps on Windows
9595

96-
1. Download [the release of Exiv2](https://github.com/Exiv2/exiv2/releases/tag/v0.28.5) :
96+
1. Download [the release of Exiv2](https://github.com/Exiv2/exiv2/releases/tag/v0.28.7) :
9797
```sh
98-
curl -O https://github.com/Exiv2/exiv2/releases/download/v0.28.5/exiv2-0.28.5-2022msvc-AMD64.zip
99-
python -m zipfile -e exiv2-0.28.5-2022msvc-AMD64.zip .
98+
curl -O https://github.com/Exiv2/exiv2/releases/download/v0.28.7/exiv2-0.28.7-2022msvc-AMD64.zip
99+
python -m zipfile -e exiv2-0.28.7-2022msvc-AMD64.zip .
100100
```
101101

102102
2. Install `Visual Studio 2022` (must use the same version of Visual Studio as the Exiv2 build) , and set the environment variables it needs.
103103

104104
3. Prepare environment variables according to your download path:
105105
```batch
106106
"C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
107-
set EXIV2_DIR=??\exiv2-0.28.5-2022msvc-AMD64
107+
set EXIV2_DIR=??\exiv2-0.28.7-2022msvc-AMD64
108108
set LIB_DIR=??\pyexiv2\lib
109109
copy %EXIV2_DIR%\bin\exiv2.dll %LIB_DIR%
110110
```

‎pyexiv2/tests/test_func.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def test_version():
1111

1212
from .base import __exiv2_version__
1313
print('pyexiv2.__exiv2_version__={}'.format(__exiv2_version__))
14-
assert __exiv2_version__ == '0.28.5'
14+
assert __exiv2_version__ == '0.28.7'
1515
except:
1616
ENV.skip_test = True
1717
raise

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
setuptools.setup(
1010
name='pyexiv2',
11-
version='2.15.4', # need to set the variable in 'pyexiv2/__init__.py'
11+
version='2.15.5', # need to set the variable in 'pyexiv2/__init__.py'
1212
author='LeoHsiao',
1313
author_email='leohsiao@foxmail.com',
1414
description='Read and write image metadata, including EXIF, IPTC, XMP, ICC Profile.',

0 commit comments

Comments
 (0)