Date: Sunday, August 18, 2019 @ 17:37:59 Author: felixonmars Revision: 500088
upgpkg: python-celery 4.3.0-2 - remove python2 sibling - fix tests Modified: python-celery/trunk/PKGBUILD Deleted: python-celery/trunk/celery2.tmpfiles.d python-celery/trunk/[email protected] --------------------+ PKGBUILD | 113 +++++++++++++++------------------------------------ celery2.tmpfiles.d | 2 [email protected] | 15 ------ 3 files changed, 35 insertions(+), 95 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-08-18 17:30:21 UTC (rev 500087) +++ PKGBUILD 2019-08-18 17:37:59 UTC (rev 500088) @@ -5,104 +5,61 @@ # Contributor: Marco Elver <marco.elver AT gmail.com> # Contributor: apkawa <[email protected]> -pkgbase=python-celery -pkgname=('python-celery' 'python2-celery') -pkgver=4.2.2 -pkgrel=1 +pkgname=python-celery +pkgver=4.3.0 +pkgrel=2 pkgdesc='Distributed Asynchronous Task Queue' arch=('any') url='http://celeryproject.org/' license=('BSD') -makedepends=('python-setuptools' 'python2-setuptools' 'python-kombu' 'python2-kombu' - 'python-billiard' 'python2-billiard' 'python-pytz' 'python2-pytz') -checkdepends=('python-pytest32' 'python2-pytest32' 'python-pytest-runner' 'python2-pytest-runner' - 'python-case' 'python2-case' 'python-pyopenssl' 'python2-pyopenssl' 'python-gevent' - 'python2-gevent' 'python2-librabbitmq' 'python-pymongo' 'python2-pymongo' - 'python-msgpack' 'python2-msgpack' 'python-pyro' 'python2-pyro' 'python-redis' - 'python2-redis' 'python-sqlalchemy' 'python2-sqlalchemy' 'python-boto' 'python2-boto' - 'python-yaml' 'python2-yaml' 'python-pyzmq' 'python2-pyzmq' 'python-eventlet' - 'python2-eventlet') +depends=('python-kombu' 'python-billiard' 'python-pytz') +optdepends=('python-pyopenssl: for celery.security' + 'python-pymongo: for celery.backends.mongodb' + 'python-msgpack: for using the msgpack serializer' + 'python-pyro: for using Pyro4 message transport' + 'python-redis: for celery.backends.redis' + 'python-sqlalchemy: for celery.backends.database' + 'python-boto: for SQS transport' + 'python-yaml: for using the yaml serializer' + 'python-pyzmq: for using ZeroMQ transport') +makedepends=('python-setuptools') +checkdepends=('python-pytest' 'python-pytest-runner' 'python-case' 'python-pyopenssl' + 'python-gevent' 'python-pymongo' 'python-msgpack' 'python-pyro' 'python-redis' + 'python-sqlalchemy' 'python-boto' 'python-yaml' 'python-pyzmq' 'python-eventlet' + 'python-moto') source=("https://pypi.io/packages/source/c/celery/celery-$pkgver.tar.gz"; - "https://github.com/celery/celery/commit/e7002769211f7340f38df80b3112706a8e07cafb.patch"; - "https://github.com/celery/celery/commit/1c3a15938d0b9dde674d4666689d6a6c733d64e4.patch"; - [email protected] [email protected] - celery.tmpfiles.d celery2.tmpfiles.d) + https://github.com/celery/celery/commit/89c4573ac47a1f840ed2d15e2820d0eaed29dc32.patch + https://github.com/celery/celery/commit/6514fed13ef2f992b2846116f9b2d1237aac8298.patch + [email protected] celery.tmpfiles.d) options=('!emptydirs') -sha512sums=('22183c8bfed0c17aa50ec8bda16fb4faf5e5e2cab4265124f0831929dc6414daabf182c4b07a8d6385a4954a440c3c99cfd1e784b126f566fcdbb887feeefd9b' - 'f3778f20233f50fa0fa39c7f8b5ca1f5c9dafd342aa58ccb9083e8126d229a97d3a28ef9892d713659113f440bfbbe5cb2b4085a1c5fa4dbf9047670ff184d8d' - '470bbd68cbc31a48cedac4e09a45d0f414bd765450e65697d443f0e4ace8eb141735b7a4bd5d23e912d1f9d0014770bc8196bef5625b54162c7ad0df4cb7263a' +sha512sums=('91dd16bd6c9544c76d84e468872e052bdf5e1737980a1a3baee914c75c88db44b9ac8de7ddc4278988ca6cb159496b6560cecd6bb51d6352725009e97d268afb' + '691ae1b4bf98317f6bea2d2ae26cd770c5a5242ae6b41d8d5cd0ea0ce3d521d5f3b16a1b1f33429bd777f7f628c84e29a5bada37ecb33e73c0118f9c1f992a12' + '6c3e6da14c57cad5e26a34c5d5f59977938fbb93ae04b97b88427ca3c67b1f0ff8cf4bbfb42394ac2a6714cf847527275f99a45f6e34fb260686bb80b80d7cc4' '3c6c9dbdacca2de12d49c03526b34797fd867c14d04115af0d1fda64d2848a5d3f64ceb6d284be319a81d932dc86e69c157b6f5f859f2fa213fc2f43a6052c65' - '1227803e56d5ea7879e097609b8f85633d6c0af4fa3607b98b4f30ffad093b0f3c3e7c54d965f44e954b6d9642a08e767836a9b837e225772d61dffa2042577c' - '67279b75c3b44d065811c9c90aee006296164000912d5bb97c74956b26ee4ad4f0847e846052a896d379848b869c849300367e676d3f689cf29e3a0c7ae5310b' - 'ffeb86b07440de7943343d5a9348980a45d414f42dd29fd78f70e3680600e5dfb6a3a48748746e3af00f42aad9ba1cd8efeb8b2e81e86fb6febde16429b51399') + '67279b75c3b44d065811c9c90aee006296164000912d5bb97c74956b26ee4ad4f0847e846052a896d379848b869c849300367e676d3f689cf29e3a0c7ae5310b') prepare() { - # python 3.7 compat - patch -p1 -d celery-$pkgver < e7002769211f7340f38df80b3112706a8e07cafb.patch - patch -p1 -d celery-$pkgver < 1c3a15938d0b9dde674d4666689d6a6c733d64e4.patch - sed -i -e 's/< *3.6/<4/' -e 's/< *4.4/<5/' celery-$pkgver/requirements/default.txt - cp -a celery-$pkgver{,-py2} + # Fix for new pymongo + patch -d celery-$pkgver -p1 -i ../89c4573ac47a1f840ed2d15e2820d0eaed29dc32.patch + # Fix for new pytest + patch -d celery-$pkgver -p1 -i ../6514fed13ef2f992b2846116f9b2d1237aac8298.patch + sed -i -e 's/==/>=/' -e 's/< *4.4/<6/' celery-$pkgver/requirements/test.txt } build() { - cd "$srcdir"/celery-$pkgver + cd celery-$pkgver python setup.py build - - cd "$srcdir"/celery-$pkgver-py2 - python2 setup.py build } check() { - cd "$srcdir"/celery-$pkgver - # Project does not officially support python 3.7, and does not wish us to - # open bugreports for python 3.7 issues. Backport all known python 3.7 fixes - # and hope for the best. https://github.com/celery/celery/issues/4913 - python setup.py pytest || warning "tests fail on python 3.7: https://github.com/celery/celery/issues/4913"; - - cd "$srcdir"/celery-$pkgver-py2 - python2 setup.py pytest + cd celery-$pkgver + python setup.py pytest } -package_python-celery() { - depends=('python-kombu' 'python-billiard' 'python-pytz') - optdepends=('python-pyopenssl: for celery.security' - 'python-pymongo: for celery.backends.mongodb' - 'python-msgpack: for using the msgpack serializer' - 'python-pyro: for using Pyro4 message transport' - 'python-redis: for celery.backends.redis' - 'python-sqlalchemy: for celery.backends.database' - 'python-boto: for SQS transport' - 'python-yaml: for using the yaml serializer' - 'python-pyzmq: for using ZeroMQ transport') - - cd "$srcdir"/celery-$pkgver +package() { + cd celery-$pkgver python setup.py install --root="$pkgdir" --optimize=1 --skip-build install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE install -Dm644 "$srcdir"/[email protected] "$pkgdir"/usr/lib/systemd/system/[email protected] install -Dm644 "$srcdir"/celery.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/celery.conf } - -package_python2-celery() { - depends=('python2-kombu' 'python2-billiard' 'python2-pytz') - optdepends=('python2-pyopenssl: for celery.security' - 'python2-gevent: for celery.concurrency.gevent' - 'python2-librabbitmq: optimized client for RabbitMQ' - 'python2-pymongo: for celery.backends.mongodb' - 'python2-msgpack: for using the msgpack serializer' - 'python2-pyro: for using Pyro4 message transport' - 'python2-redis: for celery.backends.redis' - 'python2-sqlalchemy: for celery.backends.database' - 'python2-boto: for SQS transport' - 'python2-yaml: for using the yaml serializer' - 'python2-pyzmq: for using ZeroMQ transport') - - cd "$srcdir"/celery-$pkgver-py2 - python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - install -Dm644 "$srcdir"/[email protected] "$pkgdir"/usr/lib/systemd/system/[email protected] - install -Dm644 "$srcdir"/celery2.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/celery2.conf - - for _exe in "$pkgdir"/usr/bin/*; do - mv "$_exe"{,2} - done -} Deleted: celery2.tmpfiles.d =================================================================== --- celery2.tmpfiles.d 2019-08-18 17:30:21 UTC (rev 500087) +++ celery2.tmpfiles.d 2019-08-18 17:37:59 UTC (rev 500088) @@ -1,2 +0,0 @@ -d /run/celery2 0755 - - - - -d /var/log/celery2 0755 - - - - Deleted: [email protected] =================================================================== --- [email protected] 2019-08-18 17:30:21 UTC (rev 500087) +++ [email protected] 2019-08-18 17:37:59 UTC (rev 500088) @@ -1,15 +0,0 @@ -[Unit] -Description=Celery Nodes Daemon -After=network.target - -[Service] -Type=oneshot -EnvironmentFile=/etc/celery/%I.conf -ExecStart=/usr/bin/celery2 multi start $CELERYD_NODES --pidfile=/run/celery2/%n.pid --logfile=/var/log/celery2/%n.log --loglevel="INFO" $CELERYD_OPTS -ExecStop=/usr/bin/celery2 multi stopwait $CELERYD_NODES --pidfile=/run/celery2/%n.pid -ExecReload=/usr/bin/celery2 multi restart $CELERYD_NODES --pidfile=/run/celery2/%n.pid --logfile=/var/log/celery2/%n.log --loglevel="INFO" $CELERYD_OPTS -KillMode=control-group -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target
