[arch-commits] Commit in qtile/trunk (PKGBUILD qtile.install)

David Runge dvzrv at gemini.archlinux.org
Sat Jul 17 19:36:08 UTC 2021


    Date: Saturday, July 17, 2021 @ 19:36:08
  Author: dvzrv
Revision: 978410

upgpkg: qtile 0.18.0-1: Upgrade to 0.18.0.

Clean up optional, build and test dependencies in accordance with upstream's CI.
Simplify check() by only calling one top-level script to build requirements.
Disable broken and flaky tests and report issues upstream:
https://github.com/qtile/qtile/issues/2628
https://github.com/qtile/qtile/issues/2629
Fix the .install file so that messages are not printed twice by
using arithmetic expressions.

Modified:
  qtile/trunk/PKGBUILD
  qtile/trunk/qtile.install

---------------+
 PKGBUILD      |  107 +++++++++++++++++++++++++++++++++++++-------------------
 qtile.install |    5 ++
 2 files changed, 75 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-17 19:35:58 UTC (rev 978409)
+++ PKGBUILD	2021-07-17 19:36:08 UTC (rev 978410)
@@ -1,41 +1,78 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 
 pkgname=qtile
-pkgver=0.17.0
+pkgver=0.18.0
 pkgrel=1
 pkgdesc="A full-featured, pure-Python tiling window manager"
 arch=('x86_64')
 url="http://www.qtile.org"
 license=('MIT')
-depends=('gdk-pixbuf2' 'glibc' 'libnotify' 'librsvg' 'pango' 'python-cairocffi'
-'python-cffi' 'python-xcffib' 'python-dbus' 'python-gobject'
-'python-setuptools')
-makedepends=('jupyter_console' 'libpulse' 'python-ipykernel' 'python-iwlib'
-'python-keyring' 'python-psutil' 'python-pytest' 'python-setuptools-scm'
-'python-xdg')
-checkdepends=('imagemagick' 'python-psutil' 'python-pytest' 'python-xvfbwrapper' 'xorg-xcalc'
-'xorg-xclock' 'xorg-xeyes' 'xorg-server-xephyr' 'xorg-xrandr' 'xterm')
-optdepends=('alsa-utils: volume widget'
-            'canto-daemon: canto widget'
-            'cmus: cmus widget'
-            'khal: khal_calendar widget'
-            'libpulse: for pulse_volume and pulseaudio_ffi widget'
-            'lm_sensors: sensors widget'
-            'moc: moc widget'
-            'python-iwlib: wlan widget'
-            'python-keyring: imapwidget widget'
-            'python-mpd2: mpd2widget widget'
-            'python-psutil: graph, net and memory widget'
-            'python-setproctitle: change process name to qtile'
-            'python-xdg: launchbar widget'
+depends=(
+  'gdk-pixbuf2'
+  'glibc'
+  'libnotify'
+  'librsvg'
+  'pango'
+  'python-cairocffi'
+  'python-cffi'
+  'python-xcffib'
+  'python-gobject'
 )
+makedepends=(
+  'git'
+  'jupyter_console'
+  'libpulse'
+  'python-ipykernel'
+  'python-setuptools'
+  'python-setuptools-scm'
+)
+checkdepends=(
+  'graphviz'
+  'imagemagick'
+  'libgnome-keyring'
+  'lm_sensors'
+  'procps-ng'
+  'python-bowler'
+  'python-dbus-next'
+  'python-iwlib'
+  'python-keyring'
+  'python-psutil'
+  'python-pytest'
+  'python-pywlroots'
+  'python-xdg'
+  'python-xvfbwrapper'
+  'xorg-xcalc'
+  'xorg-xclock'
+  'xorg-xeyes'
+  'xorg-server-xephyr'
+  'xorg-xrandr'
+  'xterm'
+)
+optdepends=(
+  'alsa-utils: volume widget'
+  'canto-daemon: canto widget'
+  'cmus: cmus widget'
+  'khal: khal_calendar widget'
+  'libpulse: for pulse_volume and pulseaudio_ffi widget'
+  'lm_sensors: sensors widget'
+  'moc: moc widget'
+  'python-dbus-next: for utils, notifications and several widgets'
+  'python-iwlib: wlan widget'
+  'python-keyring: imapwidget widget'
+  'python-mpd2: mpd2widget widget'
+  'python-psutil: graph, net and memory widget'
+  'python-pywlroots: for experimental wayland support'
+  'python-setproctitle: change process name to qtile'
+  'python-xdg: launchbar widget'
+)
 install="${pkgname}.install"
-source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('bfe51aabef2d48693c5bb7525cf67b1bb99cf3af5a653cd81d523e5adaa4767a43e7a87db14f9b85fae3a9e414af41a2e66736556eb1552d099755ba6f39caeb')
-b2sums=('f2290ab823b31cd8ed512f076018a8df19bbfedbb7d5c6932eee7cd46c341a08af04ed0d99f4391d1b3ccc07eb33015bbf0050c1c5d749bace4fb6dcfcb71ac9')
+source=("git+https://github.com/qtile/qtile#tag=v${pkgver}?signed")
+sha512sums=('SKIP')
+b2sums=('SKIP')
+validpgpkeys=('3CCAB226289DE0160C61BDB418D18F1BC464DCA3') # Tycho Andersen <tycho at tycho.pizza>
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   python setup.py build
 }
 
@@ -43,7 +80,7 @@
   local _python_version="$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')"
   local _test_dir='test_dir'
 
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
 
   # install into test location
   mkdir -vp "${_test_dir}"
@@ -58,18 +95,16 @@
   export PYTHONPATH="${PWD}/${_test_dir}/usr/lib/python${_python_version}/site-packages/:${PYTHONPATH}"
   export PATH="${PWD}/test_dir/usr/bin:${PATH}"
   export LC_TYPE=en_US.UTF-8
-  echo "building pango"
-  python3 ./libqtile/pango_ffi_build.py
-  echo "building xcursors"
-  python3 ./libqtile/backend/x11/xcursors_ffi_build.py
-  echo "building pulseaudio volume control"
-  python3 ./libqtile/widget/pulseaudio_ffi.py
-  echo "running pytest"
-  pytest -v
+  ./scripts/ffibuild
+  # unresolved issues with the imapwidget tests: https://github.com/qtile/qtile/issues/2629
+  # some tests never return: https://github.com/qtile/qtile/issues/2628
+  pytest -vv \
+    --ignore "test/widgets/test_imapwidget.py" \
+    -k "not test_remove and not test_widget_init_config[ImapWidget-kwargs28]"
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   python setup.py install --skip-build \
     --optimize=1 \
     --root="${pkgdir}"

Modified: qtile.install
===================================================================
--- qtile.install	2021-07-17 19:35:58 UTC (rev 978409)
+++ qtile.install	2021-07-17 19:36:08 UTC (rev 978410)
@@ -1,7 +1,10 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  if [ "$(vercmp "$2" 0.17.0)" -le 0 ]; then
+  if (( "$(vercmp "$2" '0.17.0-1')" < 0 )); then
     printf "WARNING: Major config and functionality changes. A restart (not reload) of qtile is required.\n"
   fi
+  if (( "$(vercmp "$2" '0.18.0-1')" < 0 )); then
+    printf "WARNING: Major config changes. Make sure to read /usr/share/doc/qtile/CHANGELOG.\n"
+  fi
 }




More information about the arch-commits mailing list