diff --git a/backports/celery/APKBUILD b/backports/celery/APKBUILD index 362909c..8afc9c7 100644 --- a/backports/celery/APKBUILD +++ b/backports/celery/APKBUILD @@ -1,40 +1,50 @@ # Maintainer: Drew DeVault pkgname=celery pkgver=5.2.7 -pkgrel=0 +pkgrel=3 pkgdesc="An asynchronous task queue/job queue based on distributed message passing" url="http://www.celeryproject.org/" arch="noarch !s390x" # lmited by py3-kombu license="Apache-2.0" -depends="py3-urllib3 py3-redis py3-vine py3-kombu py3-billiard py3-tz" -makedepends="python3-dev py3-setuptools" +depends=" + py3-billiard + py3-click + py3-click-didyoumean + py3-click-plugins + py3-click-repl + py3-kombu + py3-tz + py3-vine + python3 + " +makedepends="python3-dev py3-setuptools py3-gpep517 py3-wheel" install="$pkgname.pre-install" source="https://files.pythonhosted.org/packages/source/c/celery/celery-$pkgver.tar.gz celery.confd celery.initd" pkgusers="celery" pkggroups="celery" -subpackages="$pkgname-openrc" +subpackages="$pkgname-openrc $pkgname-pyc" provides="py3-celery=$pkgver-r$pkgrel" # TODO: requires many many many dependencies options="!check" build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir dist \ + --output-fd 3 3>&1 >&2 } package() { - install -dm755 "$pkgdir/$confdir" - install -dm755 "$pkgdir/$confdir/conf.d" - # install scripts install -m755 -D "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname install -m644 -D "$srcdir"/$pkgname.confd \ "$pkgdir"/etc/conf.d/$pkgname - python3 setup.py install --prefix=/usr --root="$pkgdir" + python3 -m installer -d "$pkgdir" \ + dist/*.whl } check() { @@ -43,6 +53,6 @@ check() { sha512sums=" 68e3bb082f97ebe20391293cc8fa96c41c8f5ac5e8c24b2b7bd66eb104ec459bdfa49741e47486676e5daa88d7a71e3eb0d9432851aeafc74b0d4352e567e853 celery-5.2.7.tar.gz -f9458bce0d8990de646df564bec96baa0e45867f44e41380d38520905e00c941b1ce261314bb78edaa14c591e0aa9386d24c58a61f69fb0fecc616c34a24dea1 celery.confd -ff8c0451efa7157fd61f2335f4187bef6cbdd51856c7cfad4de02244c6c5ca7c584f9108731b52f020fee866365d9f092ded266c90d13cb34e92a7ffb63fed57 celery.initd +c283956f8fe386ef39cb3e165a20d1cc7ff6398fbf5a922bec6b61fe4a71188519baed9feafc4e0e5b6864851545edaba54b89ba3613b2cf2ddd6426a6bf8fc2 celery.confd +3e5e2c6a55672bc0a02fca93ad334c694066c636ed62f2b55cb8f27b9301c429d68ce53667ec744b9b152ec786de7aea90cc05a143d6942cf5d2f34e51ca4089 celery.initd " diff --git a/backports/celery/celery.confd b/backports/celery/celery.confd index 664ec4a..2d69aea 100644 --- a/backports/celery/celery.confd +++ b/backports/celery/celery.confd @@ -1,4 +1,4 @@ CELERY_USER=celery CELERY_LOG=/var/log/celery.log CELERY_REDIR="1>/dev/null 2>> ${CELERY_LOG}" -CELERY_OPTS="-A celeryapp -B --loglevel=info $CELERY_REDIR" +CELERY_OPTS="-A celeryapp $CELERY_REDIR" diff --git a/backports/celery/celery.initd b/backports/celery/celery.initd index 0d45cc9..f4e2bf9 100644 --- a/backports/celery/celery.initd +++ b/backports/celery/celery.initd @@ -4,10 +4,10 @@ supervisor=supervise-daemon description="celery queue worker" : ${CELERY_USER:="celery"} -: ${CELERY_GROUP:="$(id -gn $LS_USER)"} +: ${CELERY_GROUP:="$(id -gn $CELERY_USER)"} pidfile="/run/$RC_SVCNAME.sd.pid" -supervise_daemon_args="-u $CELERY_USER -g $CELERY_GROUP -p $pidfile" +supervise_daemon_args="-u $CELERY_USER -g $CELERY_GROUP" command=/usr/bin/celery command_args="${CELERY_OPTS}"