~alpine/aports

community/py3-importlib-resources: remove downstream patch v2 APPLIED

Drew DeVault: 1
 community/py3-importlib-resources: remove downstream patch

 2 files changed, 6 insertions(+), 50 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.alpinelinux.org/~alpine/aports/patches/3447/mbox | git am -3
Learn more about email & git

[PATCH v2] community/py3-importlib-resources: remove downstream patch Export this patch

Found a way to work around this issue.
---
Sorry, forgot to remove a file.

 .../0001-setup.cfg-remove-scm-nonsense.patch  | 43 -------------------
 community/py3-importlib-resources/APKBUILD    | 13 +++---
 2 files changed, 6 insertions(+), 50 deletions(-)
 delete mode 100644 community/py3-importlib-resources/0001-setup.cfg-remove-scm-nonsense.patch

diff --git a/community/py3-importlib-resources/0001-setup.cfg-remove-scm-nonsense.patch b/community/py3-importlib-resources/0001-setup.cfg-remove-scm-nonsense.patch
deleted file mode 100644
index 97c2bf800d..0000000000
--- a/community/py3-importlib-resources/0001-setup.cfg-remove-scm-nonsense.patch
@@ -1,43 +0,0 @@
From a0ee588b62cca56c756fa90d0c04a15b12d59e9a Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Mon, 8 Feb 2021 20:40:32 -0500
Subject: [PATCH] setup.cfg: remove scm nonsense

---
 pyproject.toml | 4 +---
 setup.cfg      | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b6ebc0b..8ca88ac 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,12 +1,10 @@
 [build-system]
-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"]
+requires = ["setuptools>=42", "wheel"]>=3.4.1"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]
 skip-string-normalization = true
 
-[tool.setuptools_scm]
--
 [pytest.enabler.black]
 addopts = "--black"
 
diff --git a/setup.cfg b/setup.cfg
index 7d9424d..2c336ea 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,7 +23,6 @@ include_package_data = true
 python_requires = >=3.6
 install_requires =
     zipp >= 0.4; python_version < '3.8'
-setup_requires = setuptools_scm[toml] >= 3.4.1
 
 [options.packages.find]
 exclude =
--- 
2.30.1

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