Skip to content

Commit f8ce2ad

Browse files
authored
dropped 32-bit wheels for Pi-Heif (#262)
Signed-off-by: Alexander Piskun <[email protected]>
1 parent cd269f1 commit f8ce2ad

File tree

9 files changed

+1
-242
lines changed

9 files changed

+1
-242
lines changed

.github/transform_to-pi_heif.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
# change `pillow_heif` to `pi_heif`
1212
files_list = [
1313
"setup.py",
14-
"docker/manylinux_armv7l_wheels.Dockerfile",
15-
"docker/musllinux_armv7l_wheels.Dockerfile",
1614
"docker/test_wheels.Dockerfile",
1715
"MANIFEST.in",
1816
"pillow_heif/_pillow_heif.c",

.github/workflows/build-cache-deps.yml

Lines changed: 1 addition & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
fail-fast: true
7878
matrix:
7979
cibw_buildlinux: [ manylinux, musllinux ]
80-
cibw_arch: [ "aarch64", "i686", "x86_64" ]
80+
cibw_arch: [ "aarch64", "x86_64" ]
8181
name: Pi-Heif • ${{ matrix.cibw_arch }} • ${{ matrix.cibw_buildlinux }}
8282
runs-on: ubuntu-20.04
8383
env:
@@ -100,18 +100,6 @@ jobs:
100100
- name: Install cibuildwheel & twine
101101
run: python3 -m pip install twine cibuildwheel==2.19.1
102102

103-
- name: 32-bit musllinux preparations
104-
if: matrix.cibw_buildlinux == 'musllinux' && matrix.cibw_arch == 'i686'
105-
run: echo INSTALL_OS_PACKAGES="apk update && apk --no-cache add $OS_PACKAGES" >> $GITHUB_ENV
106-
env:
107-
OS_PACKAGES: "fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
108-
109-
- name: 32-bit manylinux preparations
110-
if: matrix.cibw_buildlinux == 'manylinux' && matrix.cibw_arch == 'i686'
111-
run: echo INSTALL_OS_PACKAGES="yum makecache && yum install -y $OS_PACKAGES" >> $GITHUB_ENV
112-
env:
113-
OS_PACKAGES: "libjpeg-turbo-devel lcms2-devel"
114-
115103
- uses: actions/cache@v4
116104
with:
117105
path: ${{ env.BUILD_DIR }}
@@ -143,62 +131,3 @@ jobs:
143131

144132
- name: Fix cache permissions
145133
run: sudo chmod -R 777 ${{ env.BUILD_DIR }}
146-
147-
pi_heif_dependencies_linux_armv7:
148-
strategy:
149-
fail-fast: true
150-
matrix:
151-
i: [
152-
{ "docker_file": "manylinux_armv7l_wheels", "name": "manylinux" },
153-
{ "docker_file": "musllinux_armv7l_wheels", "name": "musllinux" },
154-
]
155-
v: ["3.10"]
156-
name: Pi-Heif • ARMv7l • ${{ matrix.i['name'] }}
157-
runs-on: ubuntu-20.04
158-
env:
159-
KEY_HEAD: Pi-Heif-ARMv7l-${{ matrix.i['name'] }}
160-
BUILD_DIR: "./build_cache"
161-
162-
steps:
163-
- uses: actions/checkout@v4
164-
- name: Transform to Pi-Heif
165-
run: |
166-
cp -r -v ./pi-heif/* .
167-
python3 .github/transform_to-pi_heif.py
168-
169-
- name: Set up QEMU
170-
uses: docker/setup-qemu-action@v3
171-
172-
- uses: actions/cache@v4
173-
with:
174-
path: ${{ env.BUILD_DIR }}
175-
key: ${{ env.KEY_HEAD }}-${{ env.KEY_C_BUILD }}-${{ env.KEY_LINUX_LIBS }}
176-
env:
177-
KEY_LINUX_LIBS: ${{ hashFiles('libheif/linux/**') }}
178-
KEY_C_BUILD: ${{ hashFiles('libheif/linux_*.py') }}-${{ hashFiles('libheif/setup.py') }}
179-
180-
- name: Build Pi-Heif
181-
uses: docker/build-push-action@v6
182-
with:
183-
context: .
184-
file: docker/${{ matrix.i['docker_file'] }}.Dockerfile
185-
build-args: |
186-
PY_VERSION=${{ matrix.v }}
187-
platforms: linux/arm/v7
188-
push: false
189-
outputs: type=local,dest=./
190-
191-
- name: Checking built wheels
192-
run: |
193-
python3 -m pip install twine
194-
python3 -m twine check ./repaired_dist/*
195-
196-
- name: Uploading wheels
197-
uses: actions/upload-artifact@v3
198-
with:
199-
name: wheels_pi_heif
200-
path: ./repaired_dist/*.whl
201-
if-no-files-found: error
202-
203-
- name: Fix cache permissions
204-
run: sudo chmod -R 777 ${{ env.BUILD_DIR }}

.github/workflows/test-src-build-linux.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ jobs:
3838
arch: ["amd64", "arm64"]
3939
docker_file: ["Alpine_3_19", "Alpine_3_20", "Almalinux_9", "Debian_12"]
4040
include:
41-
- arch: "arm/v7"
42-
docker_file: "Alpine_3_20"
43-
- arch: "arm/v7"
44-
docker_file: "Debian_12"
4541
- arch: "amd64"
4642
docker_file: "Archlinux"
4743
- arch: "amd64"

.github/workflows/test-wheels-pi_heif.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,12 @@ jobs:
2020
{ "os": "fedora", "ver": "37", "arch": "amd64" },
2121
{ "os": "debian", "ver": "11", "arch": "amd64" },
2222
{ "os": "debian", "ver": "11", "arch": "arm64" },
23-
{ "os": "debian", "ver": "11", "arch": "arm/v7" },
2423
{ "os": "debian", "ver": "12", "arch": "amd64" },
2524
{ "os": "debian", "ver": "12", "arch": "arm64" },
26-
{ "os": "debian", "ver": "12", "arch": "arm/v7" },
2725
{ "os": "alpine", "ver": "3.19", "arch": "amd64" },
2826
{ "os": "alpine", "ver": "3.19", "arch": "arm64" },
29-
{ "os": "alpine", "ver": "3.19", "arch": "arm/v7" },
3027
{ "os": "alpine", "ver": "3.20", "arch": "amd64" },
3128
{ "os": "alpine", "ver": "3.20", "arch": "arm64" },
32-
{ "os": "alpine", "ver": "3.20", "arch": "arm/v7" },
3329
]
3430

3531
steps:

.github/workflows/wheels-pi_heif.yml

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -249,70 +249,6 @@ jobs:
249249
- name: Fix cache permissions
250250
run: sudo chmod -R 777 ${{ env.BUILD_DIR }}
251251

252-
wheels_armv7l:
253-
name: ${{ matrix.i['name'] }} • ARMv7 • CPython${{ matrix.v }}
254-
runs-on: ubuntu-20.04
255-
strategy:
256-
matrix:
257-
i: [
258-
{ "docker_file": "manylinux_armv7l_wheels", "name": "manylinux" },
259-
]
260-
v: ["3.9", "3.10", "3.11", "3.12"]
261-
include:
262-
- v: "3.10"
263-
i: { "docker_file": "musllinux_armv7l_wheels", "name": "musllinux" }
264-
- v: "3.11"
265-
i: { "docker_file": "musllinux_armv7l_wheels", "name": "musllinux" }
266-
- v: "3.12"
267-
i: { "docker_file": "musllinux_armv7l_wheels", "name": "musllinux" }
268-
env:
269-
KEY_HEAD: Pi-Heif-ARMv7l-${{ matrix.i['name'] }}
270-
BUILD_DIR: "./build_cache"
271-
272-
steps:
273-
- uses: actions/checkout@v4
274-
- name: Transform to Pi-Heif
275-
run: |
276-
cp -r -v ./pi-heif/* .
277-
python3 .github/transform_to-pi_heif.py
278-
279-
- name: Set up QEMU
280-
uses: docker/setup-qemu-action@v3
281-
282-
- uses: actions/cache@v4
283-
with:
284-
path: ${{ env.BUILD_DIR }}
285-
key: ${{ env.KEY_HEAD }}-${{ env.KEY_C_BUILD }}-${{ env.KEY_LINUX_LIBS }}
286-
env:
287-
KEY_LINUX_LIBS: ${{ hashFiles('libheif/linux/**') }}
288-
KEY_C_BUILD: ${{ hashFiles('libheif/linux_*.py') }}-${{ hashFiles('libheif/setup.py') }}
289-
290-
- name: Build Pi-Heif
291-
uses: docker/build-push-action@v6
292-
with:
293-
context: .
294-
file: docker/${{ matrix.i['docker_file'] }}.Dockerfile
295-
build-args: |
296-
PY_VERSION=${{ matrix.v }}
297-
platforms: linux/arm/v7
298-
push: false
299-
outputs: type=local,dest=./
300-
301-
- name: Checking built wheels
302-
run: |
303-
python3 -m pip install twine
304-
python3 -m twine check ./repaired_dist/*
305-
306-
- name: Uploading wheels
307-
uses: actions/upload-artifact@v3
308-
with:
309-
name: wheels_pi_heif
310-
path: ./repaired_dist/*.whl
311-
if-no-files-found: error
312-
313-
- name: Fix cache permissions
314-
run: sudo chmod -R 777 ${{ env.BUILD_DIR }}
315-
316252
sdist:
317253
name: Source distribution
318254
runs-on: macos-12

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,5 +154,3 @@ if im.info["depth_images"]:
154154
| PyPy 3.10 v7.3 |||| N/A ||
155155

156156
&ast; **x86_64**, **aarch64** wheels.
157-
158-
`i686`, `ARMv7l`, `PyPy` 32-bit wheels are published only for [pi-heif](https://pypi.org/project/pi-heif/) from `0.13.0` version.

docker/manylinux_armv7l_wheels.Dockerfile

Lines changed: 0 additions & 47 deletions
This file was deleted.

docker/musllinux_armv7l_wheels.Dockerfile

Lines changed: 0 additions & 45 deletions
This file was deleted.

pi-heif/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,3 @@ if im.info["depth_images"]:
9595
| PyPy 3.10 v7.3 |||| N/A ||
9696

9797
&ast; **x86_64**, **aarch64** wheels.
98-
99-
`ARMv7l`: wheels are present for Debian 11+(Ubuntu 20.04+) and Alpine 3.16+

0 commit comments

Comments
 (0)