From 3db90b65fb5af956f07f220b26adf088d7fec782 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 3 Jul 2023 16:17:08 +0200 Subject: [PATCH 1/2] gitlab-ci: switch archlinux job to virtualenv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.com/fdroid/fdroidserver/-/jobs/4466370098 $ pip install -e .[test] error: externally-managed-environment × This environment is externally managed ╰─> To install Python packages system-wide, try 'pacman -S python-xyz', where xyz is the package you are trying to install. If you wish to install a non-Arch-packaged Python package, create a virtual environment using 'python -m venv path/to/venv'. Then use path/to/venv/bin/python and path/to/venv/bin/pip. If you wish to install a non-Arch packaged Python application, it may be easiest to use 'pipx install xyz', which will manage a virtual environment for you. Make sure you have python-pipx installed via pacman. note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9878be9..c641e748 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,6 +170,8 @@ arch_pip_install: - master@fdroid/fdroidserver script: - pacman --sync --sysupgrade --refresh --noconfirm gcc git grep python-pip python-virtualenv python-wheel tar + - python -m venv venv + - source venv/bin/activate - pip install -e .[test] - fdroid - fdroid readmeta From 132e953c8c9f7d709586442aee6ff474cfa8fa18 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 3 Jul 2023 17:44:47 +0200 Subject: [PATCH 2/2] update: use proper name for PIL image filter ANTIALIAS -> LANCZOS ANTIALIAS was made an alias of LANCZOS in 2.7.0: https://pillow.readthedocs.io/en/stable/releasenotes/2.7.0.html#antialias-renamed-to-lanczos The ANTIALIAS alias was removed in Pillow 10.0.0: https://pillow.readthedocs.io/en/stable/deprecations.html --- fdroidserver/update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 44e95c28..a1d4dbc4 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -252,7 +252,7 @@ def resize_icon(iconpath, density): if any(length > size for length in im.size): oldsize = im.size - im.thumbnail((size, size), Image.ANTIALIAS) + im.thumbnail((size, size), Image.LANCZOS) logging.debug("%s was too large at %s - new size is %s" % ( iconpath, oldsize, im.size)) im.save(iconpath, "PNG", optimize=True, @@ -1778,7 +1778,7 @@ def fill_missing_icon_densities(empty_densities, icon_filename, apk, repo_dir): size = dpi_to_px(density) - im.thumbnail((size, size), Image.ANTIALIAS) + im.thumbnail((size, size), Image.LANCZOS) im.save(icon_path, "PNG", optimize=True, pnginfo=BLANK_PNG_INFO, icc_profile=None) empty_densities.remove(density)