Skip to content

Commit f2eba80

Browse files
committed
[linux_dist.appimage] enhancement: using the latest Python standards to build and install bauh
1 parent c44ab71 commit f2eba80

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1111
- UI
1212
- regression from `0.10.6`: "name" filter not working for packages whose names contain the typed words
1313

14+
### Distribution
15+
- AppImage: using the latest Python standards to build and install bauh (using `build` and `installer` packages)
16+
1417
## [0.10.6] 2023-12-23
1518
### Features
1619
- new **verified** filter for the management table

linux_dist/appimage/AppImageBuilder.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ script:
66
- wget https://github.com/vinifmor/bauh/archive/${BAUH_VERSION}.tar.gz || exit 1
77
- tar -xf ${BAUH_VERSION}.tar.gz || exit 1
88
- cd bauh-${BAUH_VERSION} || exit 1
9-
- rm pyproject.toml || exit 1 # not using the new project file definition for now
10-
- BAUH_SETUP_NO_REQS=1 pip3 install . --prefix=/usr --root=../AppDir || exit 1
9+
- rm setup.cfg setup.py requirements.txt || exit 1 # removing the outdated installation files
10+
- python3 -m build --wheel --no-isolation || exit 1
11+
- python3 -m installer --destdir=../AppDir --prefix=/usr dist/*.whl || exit 1
1112
- test -e ../AppDir/usr/bin/bauh || exit 1
1213
- cp bauh/view/resources/img/logo.svg ../AppDir/usr/share/icons/hicolor/scalable/apps/bauh.svg || exit 1
1314
- cp bauh/desktop/bauh.desktop ../AppDir/usr/share/applications || exit 1
1415

15-
1616
AppDir:
1717
path: ./AppDir
1818

@@ -24,7 +24,6 @@ AppDir:
2424
exec: /usr/bin/python3
2525
exec_args: "$APPDIR/usr/bin/bauh $@"
2626

27-
2827
apt:
2928
arch: amd64
3029
sources:
@@ -42,12 +41,12 @@ AppDir:
4241
- sqlite3
4342
- xdg-utils
4443
exclude:
45-
- dpkg
46-
- apt
47-
- aptitude
48-
- python3-pip
49-
- python3-setuptools
50-
- python3-distutils
44+
- dpkg
45+
- apt
46+
- aptitude
47+
- python3-pip
48+
- python3-setuptools
49+
- python3-distutils
5150

5251
after_bundle:
5352
- pip3 install pyqt5==5.15.10 --prefix=/usr --root=AppDir || exit 1

linux_dist/appimage/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ ENV DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -y && \
66
apt-get upgrade -y && \
7-
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 && \
7+
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 && \
8+
pip3 install pip==23.3.2 setuptools==69.0.3 installer==0.7.0 && \
89
mkdir /build && cd /build && \
910
wget https://github.com/AppImageCrafters/appimage-builder/releases/download/v0.9.2/appimage-builder-0.9.2-35e3eab-x86_64.AppImage -O appimage-builder && \
1011
wget https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage -O appimage-tool && \

0 commit comments

Comments
 (0)