Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed Windows, FreeBSD CI #196

Merged
merged 3 commits into from
Jan 16, 2024
Merged

fixed Windows, FreeBSD CI #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8d067f
fixed Windows CI
bigcat88 Jan 16, 2024
0d8336f
Merge branch 'master' into fix-windows-ci
bigcat88 Jan 16, 2024
8941a08
fixed FreeBSD CI: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=2…
bigcat88 Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/analysis-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ jobs:
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libdav1d-7.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/rav1e.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libSvtAv1Enc.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libkvazaar-7.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libcryptopp.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libjpeg-8.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libopenjp2-7.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/zlib1.dll $site_packages/
Expand Down
7 changes: 4 additions & 3 deletions ci/cirrus_general_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,19 @@ test_src_build_full_freebsd_task:
'setup.*',
'pyproject.toml')"

name: From source(FreeBSD) / FreeBSD:13-amd64
name: From source(FreeBSD) / FreeBSD:14-amd64
freebsd_instance:
image_family: freebsd-13-2
image_family: freebsd-14-0

env:
PH_FULL_ACTION: 1
EXP_PH_LIBHEIF_VERSION: ""

install_libheif_script:
- pkg install -y libheif gcc
- pkg install -y gcc cmake aom x265
- pkg install -y py39-pip
- pkg install -y py39-pillow py39-numpy
- python3 libheif/linux_build_libs.py
install_pillow_heif_script:
- python3 -m pip -v install ".[tests-min]"
libheif_info_script:
Expand Down
7 changes: 5 additions & 2 deletions docs/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,12 @@ FreeBSD

Since Python itself does not support binary wheels for BSD systems, you should install libheif and then simply install Pillow-Heif from source.

Install `libeheif` and `gcc`::
Install `gcc`, `cmake`, `aom` and `x265`::

pkg install -y libheif gcc
- pkg install -y gcc cmake aom x265
- pkg install -y py39-pip
- pkg install -y py39-pillow py39-numpy
- python3 libheif/linux_build_libs.py

Install Python and Pillow::

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ extend-ignore = ["D107", "D105", "D203", "D213", "D401", "E203", "I001", "RUF100
"setup.py" = ["S"]

[tool.ruff.extend-per-file-ignores]
"benchmarks/**/*.py" = ["D", "S603"]
"benchmarks/**/*.py" = ["D", "S404", "S603"]
"docs/**/*.py" = ["D"]
"examples/**/*.py" = ["D", "PERF"]
"libheif/**/*.py" = ["D", "PERF", "S"]
Expand Down