community/firefox-esr/APKBUILD

@@ -5,14 +5,13 @@ pkgname=firefox-esr
 pkgver=102.2.0
 # Date of release, YY-MM-DD for metainfo file (see package())
 _releasedate=2022-08-23
-pkgrel=2
+pkgrel=3
 pkgdesc="Firefox web browser - Extended Support Release"
 url="https://www.mozilla.org/en-US/firefox/organizations/"
 # s390x and riscv64: blocked by rust and cargo
 # armhf: build failure on armhf due to wasm
 arch="x86_64 armv7 aarch64 x86 ppc64le"
 license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0"
-install="$pkgname.post-upgrade"
 depends="ffmpeg-libs"
 makedepends="
 	alsa-lib-dev
@@ -432,7 +431,7 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 export USE_SHORT_LIBNAME=1
 export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
-export MOZ_APP_PROFILE="mozilla/firefox-esr"
+export MOZ_APP_PROFILE="mozilla/firefox"
 export MOZ_APP_REMOTINGNAME=firefox-esr
 export MOZBUILD_STATE_PATH="$srcdir"/mozbuild
 # disable desktop notifications

community/firefox-esr/firefox-esr.post-upgrade

-#!/bin/sh
-
-ver_old=$2
-
-if [ "$(apk version -t "$ver_old" '102.2.0-r2')" = '<' ]; then
-	# firefox-esr appid changed in 102.2.0-r1
-	cat 2>&1 <<-EOF
-	* firefox-esr 102.2.0-r1 changed its' appid to firefox-esr, allowing it to
-	* be installed alongside regular firefox. to migrate your profile for this
-	* change, you have to move ~/.mozilla/firefox to ~/.mozilla/firefox-esr, and
-	* ensure ~/.mozilla/firefox-esr/profiles.ini contains one of the
-	* subdirectory folders (Path= is the subdir name, Default=1 is the one
-	* selected on startup).
-	EOF
-fi
-
-exit 0

community/toml-adapt/APKBUILD

 # Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu>
 # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu>
 pkgname=toml-adapt
-pkgver=0.2.7
-pkgrel=1
+pkgver=0.2.8
+pkgrel=0
 pkgdesc="A simple command-line interface (CLI) for manipulating toml files"
 url="https://github.com/firefly-cpp/toml-adapt"
 arch="noarch"
@@ -29,5 +29,5 @@ package() {
 }
 
 sha512sums="
-f5440a771ed320c622610165f63293da1e1dd061bdc7c15dd84c3680422134431088719ba28662ae7762a87326eacf53992a2b3ce58ffe3dc1151420a700880d  toml-adapt-0.2.7.tar.gz
+6748496ca8eb36ffa7c05a6a8d6efeafa95825517f6a2c2ddbe073f251be91532aeac7d444f766dfed9da9a8ab226d46598658434c4cf104c928c85866ca5688  toml-adapt-0.2.8.tar.gz
 "

community/tut/APKBUILD

 # Contributor: Alexey Yerin <yyp@disroot.org>
 # Maintainer: Alexey Yerin <yyp@disroot.org>
 pkgname=tut
-pkgver=1.0.15
-pkgrel=2
+pkgver=1.0.17
+pkgrel=0
 pkgdesc="TUI for Mastodon"
 url="https://github.com/RasmusLindroth/tut"
 arch="all"
@@ -27,5 +27,5 @@ package() {
 }
 
 sha512sums="
-37bb1b02c6ddf627a4b775d41f6e881fd7c081ee40943cfa61719a446e6279b91352ee7df73da5ca65a11ddeb20b8a56fb1a1a41e4b6cde46dae615898385d09  tut-1.0.15.tar.gz
+3415c3058828a9083a48cf38eda459cf8d31c29635c3af8d7f8e4840cae9b61d2e24822f2e7940785cf3cde25d47c297347d4183c07f5bb70e0a41b846d10600  tut-1.0.17.tar.gz
 "

testing/py3-pytest-rerunfailures/APKBUILD

 # Contributor: Philipp Glaum <p@pglaum.de>
 # Maintainer: Philipp Glaum <p@pglaum.de>
 pkgname=py3-pytest-rerunfailures
-_pkgname=pytest-rerunfailures
-pkgver=9.1.1
-pkgrel=2
+_pkgname=${pkgname#py3-}
+pkgver=10.2
+pkgrel=0
 pkgdesc="Pytest plugin to re-run tests to eliminate flaky failures"
 url="https://pypi.org/project/pytest-rerunfailures/"
 arch="noarch"
 license="MPL-2.0"
 depends="python3 py3-pytest"
-makedepends="py3-setuptools"
+makedepends="py3-setuptools py3-build py3-installer py3-wheel"
 checkdepends="py3-mock"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	python3 setup.py build
+	python3 -m build --no-isolation --wheel
 }
 
 check() {
-	py.test-3
+	python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		dist/${_pkgname/-/_}-$pkgver-py3-none-any.whl
 }
 
-sha512sums="875591306ab010494ccbb865ea6445ab37422fce9105260d9495215af44057210564aca4fed3b4765b5a30c1cbef120de716d15d10a6db91dcb7d9f5b4f3b102  pytest-rerunfailures-9.1.1.tar.gz"
+sha512sums="
+8830610276e2cc172ee372ae4d8376bc6329138751ea2737a4def6af32d05c112c872a7a180ff554018058c05ed0d109927dbac61f748586257e40b0243f03c8  pytest-rerunfailures-10.2.tar.gz
+"

testing/py3-pytest-subprocess/APKBUILD

+# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
+pkgname=py3-pytest-subprocess
+_pyname=${pkgname#py3-}
+pkgver=1.4.1
+pkgrel=0
+pkgdesc="Pytest plugin to fake subprocess"
+url="https://github.com/aklajnert/pytest-subprocess"
+arch="noarch"
+license="MIT"
+depends="python3 py3-pytest"
+makedepends="py3-setuptools"
+source="$pkgname-$pkgver.tar.gz::https://github.com/aklajnert/pytest-subprocess/archive/refs/tags/$pkgver.tar.gz"
+builddir="$srcdir/$_pyname-$pkgver"
+
+case "$CARCH" in
+	armhf|ppc64le)
+		# py3-uvloop -> py3-anyio not available
+		options="!check" ;;
+	*)
+		# Skip asyncio tests
+		# py3-flaky (pulled with py3-pytest-asyncio) conflicts with py3-pytest-rerunfailures
+		checkdepends="
+			py3-anyio
+			py3-docutils
+			py3-pygments
+			py3-pytest-rerunfailures
+			" ;;
+esac
+
+build() {
+	python3 setup.py build
+}
+
+check() {
+	python3 -m venv --system-site-packages test-env
+	test-env/bin/python3 setup.py install
+	test-env/bin/python3 -m pytest
+}
+
+package() {
+	python3 setup.py install --prefix=/usr --root="$pkgdir"
+}
+
+sha512sums="
+15e3be455e1f0b40636c2d6fd09fdc7a33039c1681daa8204ae5998fa01db473f5ff8ddded9a61f310be1cfec956f90629c1a1f6392c212bd212cf1a61b26f27  py3-pytest-subprocess-1.4.1.tar.gz
+"

testing/xonsh/APKBUILD

+# Contributor: Hoang Nguyen <folliekazetani@protonmail.com>
 # Contributor: vinnie <fz12345@gmail.com>
 # Maintainer: vinnie <fz12345@gmail.com>
 pkgname=xonsh
-pkgver=0.11.0
+pkgver=0.13.1
 pkgrel=0
 pkgdesc="Python-powered, cross-platform, Unix-gazing shell"
 url="https://xon.sh"
 arch="noarch"
 license="BSD-2-Clause"
-options="!check"  #flake8-docstrings missing, maybe later
 depends="
-	py3-pygments>=2.2
-	py3-prompt_toolkit>=3.0
 	py3-distro
-	py3-setproctitle
+	py3-prompt_toolkit>=3.0
+	py3-pygments>=2.2
+	py3-pyperclip
+	py3-ujson
+	"
+makedepends="py3-setuptools py3-build py3-installer py3-wheel"
+checkdepends="
+	bash
+	git
+	man-db
+	util-linux-misc
+	py3-pip
+	py3-pyte
+	py3-pytest
+	py3-pytest-mock
+	py3-pytest-rerunfailures
+	py3-pytest-subprocess
+	py3-pytest-timeout
+	py3-virtualenv
 	"
-makedepends="py3-setuptools"
 source="$pkgname-$pkgver.tar.gz::https://github.com/xonsh/xonsh/archive/$pkgver.tar.gz"
 
 build() {
-	python3 setup.py build
+	python3 -m build --no-isolation --wheel
 }
 
+check() {
+	# tests/test_integrations.py: TypeError: expected str, bytes or os.PathLike object, not NoneType
+	# tests/test_ptk_shell.py: AttributeError: __enter__
+	# tests/test_pipelines.py, tests/completers/test_bash_completer.py, tests/procs/test_specs.py: AssertionError with hiddent output of `echo -n`, `ls` and `dd` subprocesses
+	# tests/completers/test_bash_completer.py: AssertionError: assert <class 'subprocess.Popen'> is PopenThread (`pwd` command)
+	python3 -m pytest \
+		--ignore=tests/test_integrations.py \
+		--ignore=tests/test_pipelines.py \
+		--ignore=tests/test_ptk_shell.py \
+		--ignore=tests/completers/test_bash_completer.py \
+		--ignore=tests/procs/test_specs.py
+}
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		dist/$pkgname-$pkgver-*none-any.whl
 }
 
 sha512sums="
-e79c6b0ef78c8775f077d2e9a191144a5f37f42adda7305c40164231eff4bf2f54824cf7fb6baef038f91ada2b9901a6ebe32ecee93ffe5425c608f06f679227  xonsh-0.11.0.tar.gz
+fa8e5f84f32aa7ba12794c1200db8ae7faae5204de849c806dfede487c0784c38bbf24f55c80fdf53419eb068fe22f4b8374b932bd3b7d10db1f052fbe967fdc  xonsh-0.13.1.tar.gz
 "

testing/xonsh/xonsh.post-install

+#!/bin/sh
+add-shell '/usr/bin/xonsh'
+exit 0

testing/xonsh/xonsh.post-upgrade

+xonsh.post-install
\ No newline at end of file

testing/xonsh/xonsh.pre-deinstall

+#!/bin/sh
+remove-shell '/usr/bin/xonsh'
+exit 0