X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.cmpwn.com (mail.cmpwn.com [45.56.77.53]) by lists.alpinelinux.org (Postfix) with ESMTP id 1294AF854E5 for ; Wed, 3 Apr 2019 20:16:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cmpwn.com; s=cmpwn; t=1554322783; bh=9nKLitGshen+tN0UVtoyZ5RJKrtkgtdygV3mP4+b26k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aTUoI1RYoyRTTU5PLptRkTSc2C6WXD/fxW0HB36uYS4e9jTfwqXZj2tGCUHLWATtw hnYRP5kJPX17PFAAmBISx/xoSOnpanXPRfzvcm3rTUP+ywsNtumy+NkPPWODSEMBBa 7XkxzJAZFpoEq7BnRkeK9HdwUCGRVvV1DNMMa3WA= From: Drew DeVault To: alpine-aports@lists.alpinelinux.org Cc: Drew DeVault Subject: [alpine-aports] [PATCH v3 09/10] main/py-six: adopt Date: Wed, 3 Apr 2019 16:16:41 -0400 Message-Id: <20190403201642.14637-9-sir@cmpwn.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190403201642.14637-1-sir@cmpwn.com> References: <20190403201642.14637-1-sir@cmpwn.com> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- main/py-six/APKBUILD | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/main/py-six/APKBUILD b/main/py-six/APKBUILD index 1c9b5d097d..d154f0182b 100644 --- a/main/py-six/APKBUILD +++ b/main/py-six/APKBUILD @@ -1,19 +1,22 @@ -# Contributor: -# Maintainer: +# Maintainer: Drew DeVault pkgname=py-six _pkgname=six pkgver=1.12.0 -pkgrel=0 +pkgrel=1 pkgdesc="Python 2 and 3 compatibility library" url="https://pypi.python.org/pypi/six" arch="noarch" license="MIT" -depends="" -checkdepends="pytest" -makedepends="python2-dev python3-dev py-setuptools" +checkdepends="pytest py3-pytest" +makedepends="python2-dev python3-dev py2-setuptools py3-setuptools" subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2" source="$pkgname-$pkgver.tar.gz::https://github.com/benjaminp/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" +if [ -n "$BOOTSTRAP" ] +then + # circular dependency with pytest + options="!check" +fi build() { python2 setup.py build @@ -21,8 +24,8 @@ build() { } check() { - python2 -m pytest -rfsxX - python3 -m pytest -rfsxX + python2 -m pytest -rfsxX + python3 -m pytest -rfsxX } package() { @@ -41,6 +44,7 @@ _py() { _py2() { replaces="$pkgname" + depends="$depends py-enum34" _py python2 } -- 2.21.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---