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 22A55F85579 for ; Wed, 3 Apr 2019 20:27:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cmpwn.com; s=cmpwn; t=1554323412; bh=6GUee/S1laqzdEkMZhVezK46nfYmPTTUwMvpqIhkjUU=; h=From:To:Subject:Date:In-Reply-To:References; b=eUFpkvXyeJWMk77GNupRv8OoZdBlC4MSBxKBiKr3MyS/UNbjOrU5QKyGQwl6ijLpG y68LmbN6QBSPo9kuumb4tWb2nmlaMmUZjp+eRTF7NF7gV8WhXBuKbJWTwjDR5cp8yj Vurv2KIWswkNfORZzqt2bSjVsOU+g7cyfE7Z1ZHQ= From: Drew DeVault To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH 00/12] Adopt & upgrade celery Date: Wed, 3 Apr 2019 16:27:04 -0400 Message-Id: <20190403202715.15694-2-sir@cmpwn.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190403202715.15694-1-sir@cmpwn.com> References: <20190403202715.15694-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 *** BLURB HERE *** >From 71e82404a5444df72eb1d5db6f4435319ffd2232 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 3 Apr 2019 14:09:30 -0400 Subject: [PATCH 01/12] main/py-redis: adopt, update to 3.2.1 --- main/py-redis/APKBUILD | 64 +++++++++++++++++++++++++--------------- main/py-redis/redis.conf | 11 +++++++ 2 files changed, 51 insertions(+), 24 deletions(-) create mode 100644 main/py-redis/redis.conf diff --git a/main/py-redis/APKBUILD b/main/py-redis/APKBUILD index 28e99c683b..6ce586a33d 100644 --- a/main/py-redis/APKBUILD +++ b/main/py-redis/APKBUILD @@ -1,49 +1,65 @@ -# Maintainer: +# Maintainer: Drew DeVault pkgname=py-redis -_pkgname=${pkgname#py-} -pkgver=2.10.6 +_pyname=redis +pkgver=3.2.1 pkgrel=0 pkgdesc="Python client for Redis key-value store" url="https://github.com/andymccurdy/redis-py" arch="noarch" license="MIT" -depends="" -depends_dev="" -makedepends="python2-dev python3-dev py-setuptools" -install="" -subpackages="py2-redis:py2 py3-redis:py3" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3" +makedepends="python2 python3 py2-setuptools py3-setuptools" +checkdepends="redis py2-mock py3-mock pytest py3-pytest" +_pypiprefix="${_pyname%${_pyname#?}}" +source=" + https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz + redis.conf +" +builddir=$srcdir/$_pyname-$pkgver -builddir="$srcdir"/$_pkgname-$pkgver +prepare() { + cp -r "$builddir" "$builddir"-py2 +} build() { cd "$builddir" - python2 setup.py build python3 setup.py build + cd "$builddir"-py2 + python2 setup.py build } -_py() { - local python="$1" - pkgdesc="$pkgdesc ${python#python}" - depends="$depends $python" - install_if="$pkgname=$pkgver-r$pkgrel $python" - - cd "$builddir" - $python setup.py install --prefix=/usr --root="$subpkgdir" -} +check() ( + cd "$srcdir" + redis-server redis.conf & + redis_pid=$! + trap "kill -9 $redis_pid" EXIT + cd "$builddir" + pytest-3 + cd "$builddir"-py2 + pytest-2 +) package() { mkdir -p "$pkgdir" } -py2() { - cd "$builddir" +_py2() { + cd "$builddir"-py2 _py python2 } -py3() { +_py3() { cd "$builddir" _py python3 } -sha512sums="e7df464bc3b26e23f6a0d2d2896306c1e4792b9a2a4ecaea6dd8690ffa17853cc85345f063307295dd3c2da399f7f203f4b21d785f7e073c0501732257419dad redis-2.10.6.tar.gz" +_py() { + _python="$1" + pkgdesc="$pkgdesc (for $_python)" + depends="$depends $_python" + install_if="$pkgname=$pkgver-r$pkgrel $_python" + $_python setup.py install --prefix=/usr --root="$subpkgdir" +} + +sha512sums="be51642a8895325c3c61993dd83c3299a9e2cefc1010e04f182833f720ff161bea43d3a57d28afba991949fcf6e967c4f778002967641bffe651d5db384f2e08 redis-3.2.1.tar.gz +ef0d86a0dbd0dd80e4c66c962d0b03764f0298f8b94bebd644d40f0c219167b576adf8a133605bf6e976298e702e14eef7f9aaf3a56c8dcda62c678599ea1f21 redis.conf" diff --git a/main/py-redis/redis.conf b/main/py-redis/redis.conf new file mode 100644 index 0000000000..c7eec89a5b --- /dev/null +++ b/main/py-redis/redis.conf @@ -0,0 +1,11 @@ +bind 127.0.0.1 +protected-mode yes +port 6379 +tcp-backlog 511 +timeout 0 +tcp-keepalive 300 +supervised no +loglevel notice +logfile /dev/null +databases 16 +always-show-logo no -- 2.21.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---