update to 2.3.0

4 files changed, 36 insertions, 152 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 681e4a1d56e8..c7290d1c59aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,21 @@
 pkgbase = python-kolo
 	pkgdesc = See everything happening in your running Django app
-	pkgver = 2.2.1
-	pkgrel = 00
+	pkgver = 2.3.0
+	pkgrel = 1
 	url = https://kolo.app
-	arch = any
-	license = custom:© Kolo
-	makedepends = python-pip
-	depends = python
+	arch = x86_64
+	arch = aarch64
+	license = custom:Kolo
+	makedepends = cargo
+	makedepends = maturin
+	makedepends = python-installer
 	depends = python-cerberus
 	depends = python-click
+	depends = python-django
 	depends = python-tomli
 	depends = python-toolz
 	depends = python-ulid-py
-	depends = python-requests
-	depends = python-jinja
-	depends = python-django
-	depends = python-black
-	noextract = kolo-2.2.1-py3-none-any.whl
-	source = PKGBUILD_EXTRAS
-	source = https://files.pythonhosted.org/packages/72/e4/45c17c3ec183f9274dc24c7824c75ce1846322cb0851d28ab914454d2812/kolo-2.2.1-py3-none-any.whl
-	source = LICENSE
-	md5sums = SKIP
-	md5sums = 5a6e02fbea948093ce4cc2ecf4863712
-	md5sums = 72a73656a0823dab58aae967ffb09b63
+	source = python-kolo-2.3.0.tar.gz::https://files.pythonhosted.org/packages/source/k/kolo/kolo-2.3.0.tar.gz
+	sha256sums = 36199e196522e71679fca7ed50326ef5bb1b25fe8a8c4dc3d8c05a4a5d850526
 
 pkgname = python-kolo
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index c637f419e8df..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE: custom:© Kolo
diff --git a/PKGBUILD b/PKGBUILD
index 415c8c74fcc6..a02a06d76174 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,143 +1,34 @@
-# Maintainer: Unknown Packager
-
-export PIP_CONFIG_FILE=/dev/null
-export PIP_DISABLE_PIP_VERSION_CHECK=true
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 
 pkgname=python-kolo
-epoch=
-pkgver=2.2.1
-pkgrel=00
+_pkg="${pkgname#python-}"
+pkgver=2.3.0
+pkgrel=1
 pkgdesc='See everything happening in your running Django app'
-arch=(any)
+arch=('x86_64' 'aarch64')
 url=https://kolo.app
-license=('custom:© Kolo')
-depends=(python python-cerberus python-click python-tomli python-toolz python-ulid-py)
-depends+=(python-requests python-jinja python-django python-black)
-makedepends=(python-pip)
-checkdepends=()
-provides=()
-conflicts=(${provides%=*})  # No quotes, to avoid an empty entry.
-source=(PKGBUILD_EXTRAS)
-md5sums=(SKIP)
-noextract=()
-source+=(https://files.pythonhosted.org/packages/72/e4/45c17c3ec183f9274dc24c7824c75ce1846322cb0851d28ab914454d2812/kolo-2.2.1-py3-none-any.whl)
-md5sums+=(5a6e02fbea948093ce4cc2ecf4863712)
-noextract+=(kolo-2.2.1-py3-none-any.whl)
-source+=(LICENSE)
-md5sums+=(72a73656a0823dab58aae967ffb09b63)
-
-_first_source() {
-    echo " ${source_i686[@]} ${source_x86_64[@]} ${source[@]}" |
-        tr ' ' '\n' | grep -Pv '^(PKGBUILD_EXTRAS)?$' | head -1
-}
-
-_vcs="$(grep -Po '^[a-z]+(?=\+)' <<< "$(_first_source)")"
-if [[ "$_vcs" ]]; then
-    makedepends+=("$(pkgfile --quiet /usr/bin/$_vcs)")
-    provides+=("${pkgname%-$_vcs}")
-    conflicts+=("${pkgname%-$_vcs}")
-fi
-
-_is_wheel() {
-    [[ $(_first_source) =~ \.whl$ ]]
-}
-
-if [[ _is_wheel &&
-      $(basename "$(_first_source)" | rev | cut -d- -f1 | rev) =~ ^manylinux ]]; then
-    options=(!strip)  # https://github.com/pypa/manylinux/issues/119
-fi
-
-_dist_name() {
-    find "$srcdir" -mindepth 1 -maxdepth 1 -type d -printf '%f
-' |
-        grep -v '^_tmpenv$'
+license=('custom:Kolo')
+depends=('python-cerberus' 'python-click' 'python-django' 'python-tomli' 'python-toolz' 'python-ulid-py')
+makedepends=('cargo' 'maturin' 'python-installer')
+source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/k/$_pkg/$_pkg-$pkgver.tar.gz")
+sha256sums=('36199e196522e71679fca7ed50326ef5bb1b25fe8a8c4dc3d8c05a4a5d850526')
+
+prepare() {
+	cd "$_pkg-$pkgver/rust"
+	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
-if [[ $(_first_source) =~ ^git+ ]]; then
-    _pkgver() {
-        ( set -o pipefail
-          cd "$srcdir/$(_dist_name)"
-          git describe --long --tags 2>/dev/null |
-            sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
-          printf "r%s.%s" \
-              "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-        )
-    }
-
-    pkgver() { _pkgver; }
-fi
-
-_build() {
-    if _is_wheel; then return; fi
-    cd "$srcdir"
-    # See Arch Wiki/PKGBUILD/license.
-    # Get the first filename that matches.
-    local test_name
-    if [[ ${license[0]} =~ ^(BSD|MIT|ZLIB|Python)$ ]]; then
-        for test_name in LICENSE LICENSE.txt license.txt COPYING COPYING.md COPYING.rst COPYING.txt COPYRIGHT; do
-            if cp "$srcdir/$(_dist_name)/$test_name" "$srcdir/LICENSE" 2>/dev/null; then
-                break
-            fi
-        done
-    fi
-    # Use the latest version of pip, as Arch's version is historically out of
-    # date(!) and newer versions do fix bugs (sometimes).
-    python -mvenv --clear --system-site-packages _tmpenv
-    _tmpenv/bin/pip --quiet install -U pip
-    # Build the wheel (which we allow to fail) only after fetching the license.
-    # In order to isolate from ~/.pydistutils.cfg, we need to set $HOME to a
-    # temporary directory, and thus first $XDG_CACHE_HOME back to its real
-    # location, so that pip inserts the wheel in the wheel cache.  We cannot
-    # use --global-option=--no-user-cfg instead because that fully disables
-    # wheels, causing a from-source build of build dependencies such as
-    # numpy/scipy.
-    XDG_CACHE_HOME="${XDG_CACHE_HOME:-"$HOME/.cache"}" HOME=_tmpenv \
-        _tmpenv/bin/pip wheel -v --no-deps --wheel-dir="$srcdir" \
-        "./$(_dist_name)" || true
-}
-
-build() { _build; }
-
-_check() {
-    # Define check(), possibly using _check as a helper, to run the tests.
-    # You may need to call `python setup.py build_ext -i` first.
-    if _is_wheel; then return; fi
-    cd "$srcdir/$(_dist_name)"
-    /usr/bin/python setup.py -q test
+build() {
+	cd "$_pkg-$pkgver"
+	maturin build \
+		--release \
+		--strip \
+		--locked \
+		--all-features \
+		--target "$CARCH-unknown-linux-gnu"
 }
 
-_package() {
-    cd "$srcdir"
-    # pypa/pip#3063: pip always checks for a globally installed version.
-    python -mvenv --clear --system-site-packages _tmpenv
-    _tmpenv/bin/pip install --prefix="$pkgdir/usr" \
-        --no-deps --ignore-installed --no-warn-script-location \
-        "$(ls ./*.whl 2>/dev/null || echo ./"$(_dist_name)")"
-    if [[ -d "$pkgdir/usr/bin" ]]; then  # Fix entry points.
-        python="#!$(readlink -f _tmpenv)/bin/python"
-        for f in "$pkgdir/usr/bin/"*; do
-            # Like [[ "$(head -n1 "$f")" = "#!$(readlink -f _tmpenv)/bin/python" ]]
-            # but without bash warning on null bytes in "$f" (if it is actually
-            # a compiled executable, not an entry point).
-            if python -c 'import os, sys; sys.exit(not open(sys.argv[1], "rb").read().startswith(os.fsencode(sys.argv[2]) + b"\n"))' "$f" "$python"; then
-                sed -i '1c#!/usr/bin/python' "$f"
-            fi
-        done
-    fi
-    if [[ -d "$pkgdir/usr/etc" ]]; then
-        mv "$pkgdir/usr/etc" "$pkgdir/etc"
-    fi
-    if [[ -f LICENSE ]]; then
-        install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-    fi
+package() {
+	cd "$_pkg-$pkgver"
+	python -m installer --destdir="$pkgdir" rust/target/wheels/*.whl
 }
-
-package() { _package; }
-
-. "$(dirname "$BASH_SOURCE")/PKGBUILD_EXTRAS"
-
-# Remove makedepends already in depends (which may have been listed for the
-# first build, but autodetected on the second.
-makedepends=($(printf '%s\n' "${makedepends[@]}" |
-               grep -Pwv "^($(IFS='|'; echo "${depends[*]}"))$"))
-:  # Apparently ending with makedepends assignment sometimes fails.
diff --git a/PKGBUILD_EXTRAS b/PKGBUILD_EXTRAS
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/PKGBUILD_EXTRAS
+++ /dev/null