diff --git a/community/maturin/APKBUILD b/community/maturin/APKBUILD index 998ac5d6d07..fac74afc786 100644 --- a/community/maturin/APKBUILD +++ b/community/maturin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: omni # Maintainer: messense pkgname=maturin -pkgver=0.14.17 +pkgver=0.15.1 pkgrel=0 pkgdesc="Build and publish crates with pyo3, rust-cpython and cffi bindings" url="https://github.com/PyO3/maturin" @@ -23,11 +23,9 @@ subpackages=" $pkgname-zsh-completion py3-$pkgname:py3:noarch " -source="$pkgname-$pkgver.tar.gz::https://github.com/PyO3/maturin/archive/v$pkgver.tar.gz - cargo-args.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/PyO3/maturin/archive/v$pkgver.tar.gz" -_features="--features=log,human-panic,upload,native-tls" +_features="--features=full,native-tls" case "$CARCH" in s390x) @@ -54,7 +52,7 @@ prepare() { build() { export OPENSSL_NO_VENDOR=1 - export MATURIN_FEATURES="$_features" + export MATURIN_SETUP_ARGS="--no-default-features $_features" gpep517 build-wheel \ --wheel-dir dist \ @@ -68,7 +66,10 @@ build() { check() { export OPENSSL_NO_VENDOR=1 - cargo test --frozen --no-default-features $_features + cargo test \ + --frozen \ + --no-default-features $_features \ + -- --skip git_sdist_generator } package() { @@ -88,6 +89,5 @@ py3() { } sha512sums=" -d12503530b0d865b6b3c40e564742d0e798107102fb7167c137c1b0a4fa63bfad739320901cff15a680a09034aae553c3cd55cf0c8f1d3ed0fd96404bb93cbfe maturin-0.14.17.tar.gz -00d356cad073afa11e6f35d2c5662143409a88d5bc6bde85dd2eaaabed988a6976838a48cd9905c7e61286d5ee21c71a4772763f0f7f836c7d081176056485c1 cargo-args.patch +e298abb3cbfeae266c5f7c4bc8e57154527a5d040bf0276afe6e63e6d56978101ef399ab4883e7a5826d5eaa31f03019130200ca519b08d4e3bb0a12bee8eb77 maturin-0.15.1.tar.gz " diff --git a/community/maturin/cargo-args.patch b/community/maturin/cargo-args.patch deleted file mode 100644 index 2406a2711c6..00000000000 --- a/community/maturin/cargo-args.patch +++ /dev/null @@ -1,22 +0,0 @@ -we have to set the cargo features manually, so allow an env override -diff --git a/setup.py b/setup.py -index 41a532f..89e6cfa 100644 ---- a/setup.py -+++ b/setup.py -@@ -10,6 +10,7 @@ - # for maturin itself use `maturin sdist`. - - import platform -+import os - import sys - - try: -@@ -75,7 +76,7 @@ setup( - cmdclass={"bdist_wheel": bdist_wheel}, - packages=["maturin"], - rust_extensions=[ -- RustBin("maturin", args=cargo_args, cargo_manifest_args=["--locked"]) -+ RustBin("maturin", args=["--no-default-features", os.getenv("MATURIN_FEATURES")], cargo_manifest_args=["--locked"]), - ], - classifiers=[ - "Topic :: Software Development :: Build Tools",