Patches for aports can be sent to this list

[alpine-aports] [PATCHv2] testing/py-beautifulsoup4: fix python 3 support

Details
Message ID
<20180120164251.25116-1-sir@cmpwn.com>
Sender timestamp
1516466571
DKIM signature
missing
Download raw message
Patch: +16 -4
---
Forgot this pkgrel as well.

 testing/py-beautifulsoup4/APKBUILD | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/testing/py-beautifulsoup4/APKBUILD b/testing/py-beautifulsoup4/APKBUILD
index 26dce245b0..96bd7d9e52 100644
--- a/testing/py-beautifulsoup4/APKBUILD
+++ b/testing/py-beautifulsoup4/APKBUILD
@@ -3,22 +3,34 @@
 pkgname=py-beautifulsoup4
 _pkgname=beautifulsoup4
 pkgver=4.6.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A Python HTML/XML parser"
 url="http://www.crummy.com/software/BeautifulSoup/index.html"
 arch="noarch"
 license="MIT"
-makedepends="python2-dev py-setuptools python3-dev"
+makedepends="python2-dev py-setuptools python3-dev py2-unittest2"
 subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
+prepare() {
+	cd "$srcdir"
+	cp -r "$_pkgname-$pkgver" "$_pkgname-$pkgver"-py3
+}
+
 build() {
 	cd "$builddir"
 	python2 setup.py build || return 1
+	cd "$builddir"-py3
 	python3 setup.py build || return 1
 }
 
+check() {
+	cd "$builddir"
+	# bs4 unit tests are written for python2
+	python -m unittest discover -s bs4
+}
+
 package() {
 	mkdir -p "$pkgdir"
 }
@@ -26,11 +38,13 @@ package() {
 _py2() {
 	replaces="$pkgname"
 	depends="${depends//py-/py2-}"
+	cd "$builddir"
 	_py python2
 }
 
 _py3() {
 	depends="${depends//py-/py3-}"
+	cd "$builddir"-py3
 	_py python3
 }
 
@@ -39,8 +53,6 @@ _py() {
 	pkgdesc="$pkgdesc (for $python)"
 	depends="$depends $python"
 	install_if="$pkgname=$pkgver-r$pkgrel $python"
-
-	cd "$builddir"
 	$python setup.py install --prefix=/usr --root="$subpkgdir"
 }
 
-- 
2.15.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---