Skip to content

Commit 0c4034a

Browse files
Merge pull request #34 from jim-easterbrook/devel
Devel
2 parents 11882b0 + cd7e0e2 commit 0c4034a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+11097
-18036
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ jobs:
2424
uses: pypa/[email protected]
2525
env:
2626
CIBW_ARCHS: auto64
27+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
2728
CIBW_ENVIRONMENT: EXIV2_ROOT=libexiv2/build-linux/install
2829
CIBW_BUILD: cp*-manylinux_x86_64
2930
CIBW_TEST_COMMAND: >
3031
python3 -m exiv2 -v &&
3132
python3 -m unittest discover {project}/tests -v
3233
CIBW_BEFORE_ALL: >
3334
yum install -y zlib-devel expat-devel gettext-devel
34-
libcurl-devel libssh-devel &&
35+
libcurl-devel &&
3536
localedef -c -i de_DE -f UTF-8 de_DE.UTF-8 &&
3637
cd libexiv2 &&
3738
cmake -B build-linux -D CMAKE_BUILD_TYPE=Release
@@ -44,13 +45,13 @@ jobs:
4445
-D EXIV2_ENABLE_VIDEO=ON
4546
-D EXIV2_ENABLE_WEBREADY=ON
4647
-D EXIV2_ENABLE_CURL=ON
47-
-D EXIV2_ENABLE_SSH=ON
48+
-D EXIV2_ENABLE_SSH=OFF
4849
-D CMAKE_CXX_STANDARD=98 &&
4950
cmake --build build-linux &&
5051
cmake --install build-linux
5152
5253
- name: Store results
5354
uses: actions/upload-artifact@v3
5455
with:
55-
name: manylinux-wheel
56+
name: linux-27-wheels
5657
path: wheelhouse/*.whl

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
python3 -m unittest discover {project}/tests -v
4343
CIBW_BEFORE_ALL: >
4444
yum install -y --nogpgcheck zlib-devel expat-devel gettext-devel
45-
libcurl-devel libssh-devel brotli-devel meson &&
45+
libcurl-devel brotli-devel meson &&
4646
localedef -c -i de_DE -f UTF-8 de_DE.UTF-8 &&
4747
pip install ninja &&
4848
cd inih && mkdir build && cd build &&
@@ -62,5 +62,5 @@ jobs:
6262
- name: Store results
6363
uses: actions/upload-artifact@v3
6464
with:
65-
name: manylinux-wheel
65+
name: linux-28-wheels
6666
path: wheelhouse/*.whl

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
-D EXIV2_ENABLE_VIDEO=ON
4343
-D EXIV2_ENABLE_WEBREADY=ON
4444
-D EXIV2_ENABLE_CURL=ON
45-
-D EXIV2_ENABLE_SSH=ON
45+
-D EXIV2_ENABLE_SSH=OFF
4646
-D CMAKE_CXX_STANDARD=98
4747
-G Ninja &&
4848
cmake --build build-macos --config Release &&
@@ -51,5 +51,5 @@ jobs:
5151
- name: Store results
5252
uses: actions/upload-artifact@v3
5353
with:
54-
name: macos-wheel
54+
name: macos-27-wheels
5555
path: wheelhouse/*.whl

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ jobs:
4646
- name: Store results
4747
uses: actions/upload-artifact@v3
4848
with:
49-
name: macos-wheel
49+
name: macos-28-wheels
5050
path: wheelhouse/*.whl

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
python -m unittest discover {project}/tests -v
3535
CIBW_TEST_SKIP: cp38-*
3636
CIBW_BEFORE_ALL: >
37-
brew install ninja libssh curl &&
37+
brew install ninja curl &&
3838
cd libexiv2 &&
3939
cmake . -B build-macos -DCMAKE_BUILD_TYPE=Release
4040
-D CMAKE_INSTALL_PREFIX=build-macos/install
@@ -46,7 +46,7 @@ jobs:
4646
-D EXIV2_ENABLE_VIDEO=ON
4747
-D EXIV2_ENABLE_WEBREADY=ON
4848
-D EXIV2_ENABLE_CURL=ON
49-
-D EXIV2_ENABLE_SSH=ON
49+
-D EXIV2_ENABLE_SSH=OFF
5050
-D CMAKE_CXX_STANDARD=98
5151
-D CMAKE_OSX_ARCHITECTURES=arm64
5252
-G Ninja &&
@@ -56,5 +56,5 @@ jobs:
5656
- name: Store results
5757
uses: actions/upload-artifact@v3
5858
with:
59-
name: macos-wheel
59+
name: macos-arm-27-wheels
6060
path: wheelhouse/*.whl

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ jobs:
5151
- name: Store results
5252
uses: actions/upload-artifact@v3
5353
with:
54-
name: macos-wheel
54+
name: macos-arm-28-wheels
5555
path: wheelhouse/*.whl

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ jobs:
4646
EXIV2_ROOT=libexiv2/build-msvc/install
4747
PATH="$PATH;$(pwd)\\gettext\\bin"
4848
CIBW_TEST_COMMAND: >
49-
python -m exiv2 -v
49+
python -m exiv2 -v &&
50+
python -m unittest discover {project}/tests -v
5051
CIBW_BEFORE_ALL: >
5152
pip install conan==1.59.0 &&
5253
cd libexiv2 &&
@@ -55,7 +56,7 @@ jobs:
5556
cmake -B build-msvc
5657
-D CMAKE_BUILD_TYPE=Release
5758
-D CMAKE_INSTALL_PREFIX=build-msvc/install
58-
-D EXIV2_ENABLE_WIN_UNICODE=ON
59+
-D EXIV2_ENABLE_WIN_UNICODE=OFF
5960
-D EXIV2_BUILD_SAMPLES=OFF
6061
-D EXIV2_BUILD_EXIV2_COMMAND=OFF
6162
-D EXIV2_ENABLE_BMFF=ON
@@ -70,5 +71,5 @@ jobs:
7071
- name: Store results
7172
uses: actions/upload-artifact@v3
7273
with:
73-
name: windows-wheel
74+
name: windows-27-wheels
7475
path: wheelhouse/*.whl

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ jobs:
6464
- name: Store results
6565
uses: actions/upload-artifact@v3
6666
with:
67-
name: windows-wheel
67+
name: windows-28-wheels
6868
path: wheelhouse/*.whl

CHANGELOG.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ You should have received a copy of the GNU General Public License
1616
along with this program. If not, see
1717
<http://www.gnu.org/licenses/>.
1818

19+
Changes in v0.17.0:
20+
1/ API change: derived classes of BasicIo are omitted from Python.
21+
1922
Changes in v0.16.3:
2023
1/ Binary wheels incorporate libexiv2 v0.28.2.
2124

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
python-exiv2 v\ 0.16.3
1+
python-exiv2 v\ 0.17.0
22
======================
33

44
python-exiv2 is a low level interface (or binding) to the exiv2_ C++ library.

0 commit comments

Comments
 (0)