diff --git a/CHANGELOG.md b/CHANGELOG.md index 05e47a2f..38e5918e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - UI - regression from `0.10.6`: "name" filter not working for packages whose names contain the typed words +### Distribution +- AppImage: using the latest Python standards to build and install bauh (using `build` and `installer` packages) + ## [0.10.6] 2023-12-23 ### Features - new **verified** filter for the management table diff --git a/linux_dist/appimage/AppImageBuilder.yml b/linux_dist/appimage/AppImageBuilder.yml index f0b5ad5c..f9b360df 100755 --- a/linux_dist/appimage/AppImageBuilder.yml +++ b/linux_dist/appimage/AppImageBuilder.yml @@ -6,13 +6,13 @@ script: - wget https://github.com/vinifmor/bauh/archive/${BAUH_VERSION}.tar.gz || exit 1 - tar -xf ${BAUH_VERSION}.tar.gz || exit 1 - cd bauh-${BAUH_VERSION} || exit 1 - - rm pyproject.toml || exit 1 # not using the new project file definition for now - - BAUH_SETUP_NO_REQS=1 pip3 install . --prefix=/usr --root=../AppDir || exit 1 + - rm setup.cfg setup.py requirements.txt || exit 1 # removing the outdated installation files + - python3 -m build --wheel --no-isolation || exit 1 + - python3 -m installer --destdir=../AppDir --prefix=/usr dist/*.whl || exit 1 - test -e ../AppDir/usr/bin/bauh || exit 1 - cp bauh/view/resources/img/logo.svg ../AppDir/usr/share/icons/hicolor/scalable/apps/bauh.svg || exit 1 - cp bauh/desktop/bauh.desktop ../AppDir/usr/share/applications || exit 1 - AppDir: path: ./AppDir @@ -24,7 +24,6 @@ AppDir: exec: /usr/bin/python3 exec_args: "$APPDIR/usr/bin/bauh $@" - apt: arch: amd64 sources: @@ -42,12 +41,12 @@ AppDir: - sqlite3 - xdg-utils exclude: - - dpkg - - apt - - aptitude - - python3-pip - - python3-setuptools - - python3-distutils + - dpkg + - apt + - aptitude + - python3-pip + - python3-setuptools + - python3-distutils after_bundle: - pip3 install pyqt5==5.15.10 --prefix=/usr --root=AppDir || exit 1 diff --git a/linux_dist/appimage/Dockerfile b/linux_dist/appimage/Dockerfile index 8c77f71b..0555a5b6 100644 --- a/linux_dist/appimage/Dockerfile +++ b/linux_dist/appimage/Dockerfile @@ -4,7 +4,8 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && \ apt-get upgrade -y && \ - apt-get install --no-install-recommends python3-pip python3-setuptools python3-wheel wget fuse binutils coreutils desktop-file-utils fakeroot patchelf squashfs-tools strace zsync libgdk-pixbuf2.0-dev gtk-update-icon-cache file -y && \ + apt-get install --no-install-recommends python3-pip python3-build python3-setuptools python3-wheel wget fuse binutils coreutils desktop-file-utils fakeroot patchelf squashfs-tools strace zsync libgdk-pixbuf2.0-dev gtk-update-icon-cache file -y && \ + pip3 install pip==23.3.2 setuptools==69.0.3 installer==0.7.0 && \ mkdir /build && cd /build && \ wget https://github.com/AppImageCrafters/appimage-builder/releases/download/v0.9.2/appimage-builder-0.9.2-35e3eab-x86_64.AppImage -O appimage-builder && \ wget https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage -O appimage-tool && \