Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id BC25C781A97 for <~alpine/aports@lists.alpinelinux.org>; Tue, 9 Feb 2021 15:24:01 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpwn.com; s=key1; t=1612884239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/GfwN03Ls5tHbMjTLotIQLfX+0msKnaDxdPRMKtCXz4=; b=SpQklNhTEwMT01g1SDi43Qy3Sx+rPM2BJjorQtVmpDb1xPmCgnt7bPP7/nkZo+BmTPcDPs /yZQ/X+QMQS/7Xknu+sZFgogaVgTJcrZ2uuYj6DMZ7Q/dGkUcM9TOpn69f/VFC81nDqrqO MDs1YQgVb4hEK9FjIGnsBYptWYOoCnW5hXn/QbAeUKiWjw1DCOvW4eHQK25V69ELyRAMUs tRkq1udVsaoVjfStMCVwf7p6NhQyvCPSS/OFXGCvXuYYEbwQC9zx0SNd56PNga/6j9I06H UzvW4AU7rIIx6UZPd+s+0aRnXrtnacpF3DUDbY5u87aNQIFsBho7216Gz3VEhw== From: Drew DeVault To: ~alpine/aports@lists.alpinelinux.org Cc: Drew DeVault Subject: [PATCH] community/py3-importlib-resources: remove downstream patch Date: Tue, 9 Feb 2021 10:23:57 -0500 Message-Id: <20210209152357.8150-1-sir@cmpwn.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: sir@cmpwn.com Found a way to work around this issue. --- community/py3-importlib-resources/APKBUILD | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/community/py3-importlib-resources/APKBUILD b/community/py3-importlib-resources/APKBUILD index 24fd28112a..2b56796b7d 100644 --- a/community/py3-importlib-resources/APKBUILD +++ b/community/py3-importlib-resources/APKBUILD @@ -2,7 +2,7 @@ pkgname=py3-importlib-resources _pyname=importlib_resources pkgver=5.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Read resources from Python packages" url="https://github.com/python/importlib_resources" arch="noarch" @@ -10,23 +10,22 @@ license="Apache-2.0" depends="py3-zipp" makedepends="py3-setuptools py3-setuptools_scm" _pypiprefix="${_pyname%${_pyname#?}}" -source=" - $pkgname-$pkgver.tar.gz::https://github.com/python/$_pyname/archive/v$pkgver.tar.gz - 0001-setup.cfg-remove-scm-nonsense.patch -" +source="$pkgname-$pkgver.tar.gz::https://github.com/python/$_pyname/archive/v$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver build() { + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver python3 setup.py build } check() { + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver python3 setup.py check } package() { + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="80974b77c74b38c886389253b8794721ee7b32a96e0e2dea623e6146ef33cb15445a3644e7736cad1b5031fc99c69e0506c769ffb9bbb1c85cf0bec979d795f4 py3-importlib-resources-5.1.0.tar.gz -f552ac6809f111024572778aac728c6dd725f33bf432575ea2e8114fd0f69ecee35cd0b5fe586dae96248d81a85dfda43631f1617156dc16377cdb8a843ea944 0001-setup.cfg-remove-scm-nonsense.patch" +sha512sums="80974b77c74b38c886389253b8794721ee7b32a96e0e2dea623e6146ef33cb15445a3644e7736cad1b5031fc99c69e0506c769ffb9bbb1c85cf0bec979d795f4 py3-importlib-resources-5.1.0.tar.gz" -- 2.30.1