diff --git a/PKGBUILD b/PKGBUILD index 9b040cc..3285820 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Thomas Weißschuh pkgname=httpie -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=4 pkgdesc="human-friendly CLI HTTP client for the API era" url="https://github.com/httpie/httpie" @@ -28,25 +28,21 @@ conflicts=(python-httpie) replaces=(python-httpie python2-httpie) license=('BSD') arch=('any') -source=($pkgname-$pkgver.tar.gz::"https://github.com/httpie/httpie/archive/$pkgver.tar.gz" - "$pkgname-$pkgver-py311.patch::https://github.com/httpie/httpie/commit/e73c3e6c249b89496b4f81fa20bb449911da79f1.patch" -) -sha256sums=('803e1624e005c2f7002802a77ebc687b05375aca76af42639f844405328633eb' - '564cc2627f01c1b1b242e6e538736e539e56ec2ffc278d73d43df6ff04a85f47') +source=($pkgname-$pkgver.tar.gz::"https://github.com/httpie/cli/archive/$pkgver.tar.gz") +sha256sums=('01b4407202fac3cc68c73a8ff1f4a81a759d9575fabfad855772c29365fe18e6') prepare() { - cd "${pkgname}-${pkgver}" - patch -Np1 < "$srcdir/httpie-3.2.1-py311.patch" + cd "cli-${pkgver}" } build() { - cd $pkgname-$pkgver + cd cli-$pkgver python3 setup.py build } package() { - cd $pkgname-$pkgver + cd cli-$pkgver install -Dm644 LICENSE "$pkgdir/usr/share/licenses/httpie/LICENSE" python3 setup.py install --root="$pkgdir" --optimize=1 @@ -57,10 +53,13 @@ package() { } check() { - cd $pkgname-$pkgver + cd cli-$pkgver + python -m venv --system-site-packages test-env + # Werkzeug > 2.3.0 breaks tests. Upstream pined it to < 2.1.0: https://github.com/httpie/cli/blob/e52a60e67ca15291c9ab18f395d4d7af3a6204ff/setup.py#L17 + test-env/bin/python -m pip install 'Werkzeug<2.3.0' # The exclude line is taken from Fedora # https://src.fedoraproject.org/rpms/httpie/blob/rawhide/f/httpie.spec - PYTHONDONTWRITEBYTECODE=1 pytest \ + PYTHONDONTWRITEBYTECODE=1 test-env/bin/python -m pytest \ -m 'not requires_installation' \ -k "not (url_colon_slash_slash_only or quiet_with_check_status_non_zero or (plugins and uninstall) or broken_plugins or existing_and_new_cookies_sent_in_request or stdin_read_warning)" \ tests