~alpine/aports

community/py3-importlib-resources: new aport v1 APPLIED

Drew DeVault: 2
 community/py3-importlib-resources: new aport
 community/qutebrowser: add missing dependency

 3 files changed, 79 insertions(+), 4 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/3445/mbox | git am -3
Learn more about email & git

[PATCH 1/2] community/py3-importlib-resources: new aport Export this patch

---
 .../0001-setup.cfg-remove-scm-nonsense.patch  | 43 +++++++++++++++++++
 community/py3-importlib-resources/APKBUILD    | 32 ++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 community/py3-importlib-resources/0001-setup.cfg-remove-scm-nonsense.patch
 create mode 100644 community/py3-importlib-resources/APKBUILD

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
new file mode 100644
index 0000000000..97c2bf800d
--- /dev/null
+++ b/community/py3-importlib-resources/0001-setup.cfg-remove-scm-nonsense.patch
@@ -0,0 +1,43 @@
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
new file mode 100644
index 0000000000..24fd28112a
--- /dev/null
+++ b/community/py3-importlib-resources/APKBUILD
@@ -0,0 +1,32 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=py3-importlib-resources
_pyname=importlib_resources
pkgver=5.1.0
pkgrel=0
pkgdesc="Read resources from Python packages"
url="https://github.com/python/importlib_resources"
arch="noarch"
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
"
builddir="$srcdir"/$_pyname-$pkgver

build() {
	python3 setup.py build
}

check() {
	python3 setup.py check
}

package() {
	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"
-- 
2.30.1

[PATCH 2/2] community/qutebrowser: add missing dependency Export this patch

---
 community/qutebrowser/APKBUILD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/community/qutebrowser/APKBUILD b/community/qutebrowser/APKBUILD
index 0cee72e2e0..afc0530bbd 100644
--- a/community/qutebrowser/APKBUILD
+++ b/community/qutebrowser/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=qutebrowser
pkgver=2.0.1
pkgrel=0
pkgver=2.0.2
pkgrel=1
pkgdesc="Keyboard-driven, vim-like browser based on PyQT5"
url="https://qutebrowser.org/"
arch="noarch !s390x !ppc64le !armhf !mips !mips64" # Blocked on mips, s390x and ppc64le by qt5-qtwebengine, on armhf by py3-qt5 -> qt5-qtdeclarative-dev
@@ -11,7 +11,7 @@ options="!check" # missing pytest dependencies
depends="
	py3-jinja2 py3-qt5 py3-yaml qt5-qtbase
	qt5-qtwebengine qt5-qtbase-sqlite py3-qtwebengine
	py3-sip-pyqt5
	py3-sip-pyqt5 py3-importlib-resources
"
makedepends="asciidoc py3-setuptools"
checkdepends="py3-pytest py3-pytest-benchmark py3-pytest-rerunfailures py3-pytest-mock py3-hypothesis"
@@ -39,4 +39,4 @@ package() {
	make -f misc/Makefile DESTDIR="$pkgdir" PREFIX=/usr install
}

sha512sums="c0542b95456eb94b763401b440962a3aec73de5c53bc0924ab94edfe49f2efac19e6601aedd499b1561e5e83da581729bdde27c709800a130b6e90af16fb3f15  qutebrowser-2.0.1.tar.gz"
sha512sums="523eb6a46e88fc3bea724867d92042e86f75948a660159e4bf7c21b98737dd67e05fd62840d3de06c5562c8e8833a2178cfd9fd620b95b7521d695044e08f5bd  qutebrowser-2.0.2.tar.gz"
-- 
2.30.1