From 4794f3464517d534a2a0175a69d1056a5d0b7322 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 14 Jun 2022 12:28:37 +0200 Subject: [PATCH] py3-celery: upgrade to 5.2.7 --- sr.ht/py3-celery/7446.patch | 34 ++++++++++++++++++++++++++++++++++ sr.ht/py3-celery/APKBUILD | 6 ++++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 sr.ht/py3-celery/7446.patch diff --git a/sr.ht/py3-celery/7446.patch b/sr.ht/py3-celery/7446.patch new file mode 100644 index 0000000..1472437 --- /dev/null +++ b/sr.ht/py3-celery/7446.patch @@ -0,0 +1,34 @@ +From 85a8fcf0a6eb421218d746eedd88d158c450cf35 Mon Sep 17 00:00:00 2001 +From: Omer Katz +Date: Sat, 9 Apr 2022 13:27:58 +0300 +Subject: [PATCH] Avoid importing buf_t from billiard's compat module as it was + removed. + +buf_t was a compatibility layer for 2.7, it's no longer needed so it was removed from billiard. +We should adjust the code in Celery as well. +--- + celery/concurrency/asynpool.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/celery/concurrency/asynpool.py b/celery/concurrency/asynpool.py +index b9f2875a26..489336936c 100644 +--- a/celery/concurrency/asynpool.py ++++ b/celery/concurrency/asynpool.py +@@ -26,7 +26,7 @@ + from weakref import WeakValueDictionary, ref + + from billiard import pool as _pool +-from billiard.compat import buf_t, isblocking, setblocking ++from billiard.compat import isblocking, setblocking + from billiard.pool import ACK, NACK, RUN, TERMINATE, WorkersJoined + from billiard.queues import _SimpleQueue + from kombu.asynchronous import ERR, WRITE +@@ -868,7 +868,7 @@ def send_job(tup): + header = pack('>I', body_size) + # index 1,0 is the job ID. + job = get_job(tup[1][0]) +- job._payload = buf_t(header), buf_t(body), body_size ++ job._payload = memoryview(header), memoryview(body), body_size + put_message(job) + self._quick_put = send_job + diff --git a/sr.ht/py3-celery/APKBUILD b/sr.ht/py3-celery/APKBUILD index 0181051..57aa9ae 100644 --- a/sr.ht/py3-celery/APKBUILD +++ b/sr.ht/py3-celery/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=py3-celery _pyname=celery -pkgver=5.2.6 +pkgver=5.2.7 pkgrel=0 pkgdesc="Distributed Asyncronous Task Queue" url="http://celeryproject.org" @@ -21,6 +21,7 @@ depends=" " source=" https://pypi.io/packages/source/c/celery/celery-$pkgver.tar.gz + 7446.patch " builddir="$srcdir/$_pyname-$pkgver" @@ -37,5 +38,6 @@ package() { } sha512sums=" -143d0b7dc2484e4b36b8d02c528cfda156808777f936a245ceb85b9f0e74df75b835e44ed4c25ff95a7d2482ca3343991bdfcbfa338e98c727c2757296116e89 celery-5.2.6.tar.gz +68e3bb082f97ebe20391293cc8fa96c41c8f5ac5e8c24b2b7bd66eb104ec459bdfa49741e47486676e5daa88d7a71e3eb0d9432851aeafc74b0d4352e567e853 celery-5.2.7.tar.gz +de75758692f07bd181137095dbb3e5edc0e88c23a57df286ff52c5f5db384cb704924a43ee8f6379fec0430c06c41c529d2c2609f23546b7db0a306a069274f9 7446.patch " -- 2.45.2