public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: dev-python/celery/files/, dev-python/celery/
@ 2021-05-07 11:31 Alessandro Barbieri
  0 siblings, 0 replies; 3+ messages in thread
From: Alessandro Barbieri @ 2021-05-07 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     e3de43a2144298f7bace23b72556ff935a5787e4
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Fri May  7 11:23:12 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Fri May  7 11:31:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e3de43a2

dev-python/celery: initial import

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-python/celery/Manifest                  |   1 +
 dev-python/celery/celery-5.1.0_beta2.ebuild | 102 ++++++++++++++
 dev-python/celery/files/celery.confd-r2     |  51 +++++++
 dev-python/celery/files/celery.initd-r2     | 205 ++++++++++++++++++++++++++++
 dev-python/celery/metadata.xml              |  12 ++
 5 files changed, 371 insertions(+)

diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
new file mode 100644
index 000000000..7443b7b5d
--- /dev/null
+++ b/dev-python/celery/Manifest
@@ -0,0 +1 @@
+DIST celery-5.1.0_beta2.tar.gz 1459863 BLAKE2B 1b5a49728fa97e00112cc31731998ac06b2bb77ed621321b119d44d8cf0e4ec347d92b0857f316bda48f61a0ce0bd5c9d55392a8e3053369577d503af7aafc35 SHA512 d430a33cbc34950d68cf228707e8e868834f80a7f6c40491d8a67b056af5395c03e27c2b2ba1e2b9a390598d7d8bb3609bd88b388dfb18a34d0441ed54245192

diff --git a/dev-python/celery/celery-5.1.0_beta2.ebuild b/dev-python/celery/celery-5.1.0_beta2.ebuild
new file mode 100644
index 000000000..3f2f4e684
--- /dev/null
+++ b/dev-python/celery/celery-5.1.0_beta2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit bash-completion-r1 distutils-r1 eutils optfeature
+
+MYPV="${PV/_beta/b}"
+DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
+HOMEPAGE="
+	http://celeryproject.org
+	https://pypi.org/project/celery
+	https://github.com/celery/celery
+"
+SRC_URI="https://github.com/celery/celery/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+# There are a number of other optional 'extras'
+IUSE="examples"
+#RESTRICT="!test? ( test )"
+RESTRICT="test" #'celery' not found in `markers` configuration option
+S="${WORKDIR}/${PN}-${MYPV}"
+
+RDEPEND="
+	>=dev-python/billiard-3.6.4.0[${PYTHON_USEDEP}]
+	<dev-python/billiard-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7[${PYTHON_USEDEP}]
+	<dev-python/click-8[${PYTHON_USEDEP}]
+	>=dev-python/click-didyoumean-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/click-plugins-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/click-repl-0.1.6[${PYTHON_USEDEP}]
+	<dev-python/kombu-6.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-5[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/vine-5[${PYTHON_USEDEP}]
+	<dev-python/vine-6[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/boto3-1.9.178[${PYTHON_USEDEP}]
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/moto-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.2[${PYTHON_USEDEP}]
+		dev-python/pytest-celery[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-click-2.5.0[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	)
+"
+# testsuite needs it own source
+DISTUTILS_IN_SOURCE_BUILD=1
+distutils_enable_tests pytest
+distutils_enable_sphinx docs --no-autodoc
+
+python_install_all() {
+	# Main celeryd init.d and conf.d
+	newinitd "${FILESDIR}/celery.initd-r2" celery
+	newconfd "${FILESDIR}/celery.confd-r2" celery
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	newbashcomp extra/bash-completion/celery.bash "${PN}"
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "zookeeper support" dev-python/kazoo
+	optfeature "msgpack support" dev-python/msgpack
+	#optfeature "rabbitmq support" dev-python/librabbitmq
+	#optfeature "slmq support" dev-python/softlayer_messaging
+	optfeature "eventlet support" dev-python/eventlet
+	#optfeature "couchbase support" dev-python/couchbase
+	optfeature "redis support" dev-db/redis dev-python/redis-py
+	optfeature "gevent support" dev-python/gevent
+	optfeature "auth support" dev-python/pyopenssl
+	optfeature "pyro support" dev-python/pyro:4
+	optfeature "yaml support" dev-python/pyyaml
+	optfeature "memcache support" dev-python/pylibmc
+	optfeature "mongodb support" dev-python/pymongo
+	optfeature "sqlalchemy support" dev-python/sqlalchemy
+	optfeature "sqs support" dev-python/boto
+	#optfeature "cassandra support" dev-python/cassandra-driver
+}

diff --git a/dev-python/celery/files/celery.confd-r2 b/dev-python/celery/files/celery.confd-r2
new file mode 100644
index 000000000..d5ba2f7c9
--- /dev/null
+++ b/dev-python/celery/files/celery.confd-r2
@@ -0,0 +1,51 @@
+# /etc/conf.d/celery
+
+##############################################################################
+# GLOBAL CONFIGURATION
+
+# User and group
+#CELERY_USER="celery"
+#CELERY_GROUP="celery"
+
+# This is generaly a good idea to set the environment correctly
+# because a lot of python package try to use HOME on init
+#export HOME="/var/lib/myproject"
+
+# Full path to the python project directory.
+#CELERY_PROJDIR="/var/lib/myproject"
+
+##############################################################################
+# CELERYD
+
+# Start the Celery worker daemon
+#CELERYD_ENABLED="yes"
+
+# celeryd notes
+#CELERYD_NODES="celery"
+
+# celeryd options
+# Example: set a 5 minute hard time limit for tasks, disable queue process prefetching and specify an app module from CELERY_PROJDIR
+#CELERYD_OPTS="--time-limit=300 -Ofair -A celeryapp"
+
+# Location and level of the celeryd log file
+#CELERYD_LOG_FILE=/var/log/celery/celeryd@%n.log
+#CELERYD_LOG_LEVEL="INFO"
+
+# Location of the celeryd pid file
+#CELERYD_PID_FILE=/run/celery/celeryd@%n.pid
+
+##############################################################################
+# CELERYBEAT
+
+# Start the Celery task scheduler daemon
+#CELERYBEAT_ENABLED="yes"
+
+# celerybeat options
+#CELERYBEAT_OPTS=""
+
+# Location and level of the celerybeat log file
+#CELERYBEAT_LOG_FILE=/var/log/celery/celerybeat.log
+#CELERYBEAT_LOG_LEVEL="INFO"
+
+# Location of the celerybeat pid file
+#CELERYBEAT_PID_FILE=/run/celery/celerybeat.pid

diff --git a/dev-python/celery/files/celery.initd-r2 b/dev-python/celery/files/celery.initd-r2
new file mode 100644
index 000000000..f34c13669
--- /dev/null
+++ b/dev-python/celery/files/celery.initd-r2
@@ -0,0 +1,205 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the BSD license
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use rabbitmq redis logger dns
+}
+
+CELERYD_ENABLED=${CELERYD_ENABLED:-"no"}
+CELERYD_PID_FILE=${CELERYD_PID_FILE:-"/run/celery/celeryd@%n.pid"}
+CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-"/var/log/celery/celeryd@%n.log"}
+CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-"INFO"}
+CELERYD_NODES=${CELERYD_NODES:-"celery"}
+
+CELERYBEAT_ENABLED=${CELERYBEAT_ENABLED:-"no"}
+CELERYBEAT_PID_FILE=${CELERYBEAT_PID_FILE:-"/run/celery/celerybeat.pid"}
+CELERYBEAT_LOG_FILE=${CELERYBEAT_LOG_FILE:-"/var/log/celery/celerybeat.log"}
+CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-"INFO"}
+
+export CELERY_LOADER
+
+CELERYD_MULTI=${CELERYD_MULTI:-"celery multi"}
+CELERYCTL=${CELERYCTL:-"celery"}
+CELERYBEAT=${CELERYBEAT:-"celery beat"}
+
+CELERYD_OPTS="${CELERYD_OPTS}"
+CELERYBEAT_OPTS="${CELERYBEAT_OPTS} -f ${CELERYBEAT_LOG_FILE} -l ${CELERYBEAT_LOG_LEVEL}"
+
+create_dirs() {
+	local logfile="${1}"
+	local pidfile="${2}"
+	local logdir=$(dirname ${logfile})
+	local piddir=$(dirname ${pidfile})
+
+	checkpath -d -q -m 0750 -o ${CELERY_USER:-"root"}:${CELERY_GROUP:-"root"} ${logdir} ${piddir}
+}
+
+[ -n "${CELERY_USER}" ] && DAEMON_OPTS="${DAEMON_OPTS} --uid=${CELERY_USER}"
+[ -n "${CELERY_GROUP}" ] && DAEMON_OPTS="${DAEMON_OPTS} --gid=${CELERY_GROUP}"
+
+checkconfig() {
+	if [ ! -c /dev/null ]; then
+		eerror "/dev/null is not a character device!"
+		return 1
+	fi
+
+	if [ -z "${CELERY_PROJDIR}" ]; then
+		eerror "Missing CELERY_PROJDIR variable"
+		return 1
+	fi
+
+	yesno "${CELERYD_ENABLED}" && \
+		create_dirs "${CELERYD_LOG_FILE}" "${CELERYD_PID_FILE}"
+
+	yesno "${CELERYBEAT_ENABLED}" && \
+		create_dirs "${CELERYBEAT_LOG_FILE}" "${CELERYBEAT_PID_FILE}"
+
+	return 0
+}
+
+celery_chdir() {
+	[ -n "${CELERY_PROJDIR}" ] && cd "${CELERY_PROJDIR}"
+}
+
+wait_pid () {
+	local pidfile=${1}
+	local timeout=${STOPTIMEOUT:-"10"}
+	local PID=$(cat "${pidfile}" 2>/dev/null)
+
+	while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do
+		kill -0 ${PID} 2>/dev/null || break
+		kill -TERM "${PID}"
+		timeout=$((${timeout} - 1))
+		sleep 0.5
+	done
+
+	[ "${timeout}" -lt 1 ] && return 1
+	[ -f ${pidfile} ] && rm -f ${pidfile}
+	return 0
+}
+
+# celeryd
+start_workers() {
+	yesno "${CELERYD_ENABLED}" || return 0
+
+	${CELERYD_MULTI} start ${CELERYD_NODES} ${DAEMON_OPTS} \
+				--pidfile="${CELERYD_PID_FILE}" \
+				--logfile="${CELERYD_LOG_FILE}" \
+				--loglevel="${CELERYD_LOG_LEVEL}" \
+				${CELERYD_OPTS}
+}
+
+stop_workers() {
+	yesno "${CELERYD_ENABLED}" || return 0
+
+	local timeout=${STOPTIMEOUT:-"10"}
+
+	${CELERYD_MULTI} stop ${CELERYD_NODES} --pidfile="${CELERYD_PID_FILE}" || return 1
+
+	# Wait for each node
+	for node in ${CELERYD_NODES}; do
+		local pidfile=${CELERYD_PID_FILE/\%n/${node}}
+		local PID=$(cat "${pidfile}" 2>/dev/null)
+		while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do
+		kill -0 ${PID} 2>/dev/null || break
+		timeout=$((${timeout} - 1))
+		sleep 0.5
+		done
+	done
+
+	[ "${timeout}" -lt 1 ] && return 1
+	return 0
+}
+
+restart_workers() {
+	yesno "${CELERYD_ENABLED}" || return 0
+
+	${CELERYD_MULTI} restart ${CELERYD_NODES} ${DAEMON_OPTS} \
+		--pidfile="${CELERYD_PID_FILE}" \
+		--logfile="${CELERYD_LOG_FILE}" \
+		--loglevel="${CELERYD_LOG_LEVEL}" \
+		${CELERYD_OPTS}
+}
+
+# celerybeat
+start_beat() {
+	yesno "${CELERYBEAT_ENABLED}" || return 0
+
+	ebegin "Starting celerybeat"
+	${CELERYBEAT} ${CELERYBEAT_OPTS} ${DAEMON_OPTS} --detach \
+		--pidfile="${CELERYBEAT_PID_FILE}"
+	eend ${?}
+}
+
+
+stop_beat() {
+	yesno "${CELERYBEAT_ENABLED}" || return 0
+
+	ebegin "Stopping celerybeat"
+	if [ -f "${CELERYBEAT_PID_FILE}" ]; then
+		wait_pid "${CELERYBEAT_PID_FILE}"
+	else
+		ewarn "not running"
+	fi
+	eend ${?}
+}
+
+
+start() {
+	local cr=0
+
+	checkconfig || return 1
+
+	ebegin "Starting ${SVCNAME}"
+	eindent
+
+	celery_chdir && \
+		start_workers && \
+		start_beat || cr=1
+
+	eoutdent
+	eend ${cr}
+}
+
+stop() {
+	local cr=0
+
+	checkconfig || return 1
+
+	ebegin "Stopping ${SVCNAME}"
+	eindent
+
+	celery_chdir
+	stop_workers || cr=1
+	stop_beat || cr=1
+
+	eoutdent
+	eend ${cr}
+}
+
+reload() {
+	local cr=0
+
+	checkconfig || return 1
+
+	ebegin "Restarting ${SVCNAME}"
+	eindent
+
+	celery_chdir
+	restart_workers || cr=1
+	stop_beat && start_beat || cr=1
+
+	eoutdent
+	eend ${cr}
+}
+
+status() {
+	checkconfig || return 1
+
+	celery_chdir && \
+		${CELERYCTL} status
+}

diff --git a/dev-python/celery/metadata.xml b/dev-python/celery/metadata.xml
new file mode 100644
index 000000000..5f66fdc1c
--- /dev/null
+++ b/dev-python/celery/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<description>comaintainers welcome</description>
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">celery</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-python/celery/files/, dev-python/celery/
@ 2022-10-23 21:04 Anna Vyalkova
  0 siblings, 0 replies; 3+ messages in thread
From: Anna Vyalkova @ 2022-10-23 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     ff7f99366c423cf1e3957096cf1fb831bb2581d2
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Fri Oct 21 15:39:35 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun Oct 23 20:48:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ff7f9936

dev-python/celery: add 5.3.0_beta1, drop 5.2.6

Closes: https://bugs.gentoo.org/859769
Closes: https://bugs.gentoo.org/841970
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 dev-python/celery/Manifest                         |  2 +-
 ...lery-5.2.6.ebuild => celery-5.3.0_beta1.ebuild} | 57 +++++++++++++---------
 dev-python/celery/files/celery.initd-r2            | 51 ++++++++++---------
 3 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index ef4f9c17e..e5bf84e1d 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1 +1 @@
-DIST celery-5.2.6.tar.gz 1490948 BLAKE2B 1470b74b5d9345ddbb466ec83e684c71fd999fb9671be8a99c795d82ee53a45a5ec5e5c383104933ef2359b655043c408eef8de7dce7c5327a42b7d978a0b711 SHA512 80565cee3ac20a4a28e64582bd2a8cd807980447254d5cbad41c9954a012c025c402c5113d9610f879e74bf170ae7e3c70b5a3ace7228ae510feee380b9b48f9
+DIST celery-5.3.0_beta1.gh.tar.gz 1509819 BLAKE2B 8864d9895823fde8ed1938a8b418906e624f14f6d306f1afb54bfc3c1897facfb22a85e368b2fb3ac96992d639e5f03589bfc78488de9ce060c88d9d1321e4ab SHA512 c617a03ca85120b7889eb94b36e41b3ba45b93acfe239c56c93b0860042a06fceaad1c396342e27f941ae58fd3d7468bf22d6b042b04e246b55abe5eedb63016

diff --git a/dev-python/celery/celery-5.2.6.ebuild b/dev-python/celery/celery-5.3.0_beta1.ebuild
similarity index 59%
rename from dev-python/celery/celery-5.2.6.ebuild
rename to dev-python/celery/celery-5.3.0_beta1.ebuild
index 0b047820e..0075e42b3 100644
--- a/dev-python/celery/celery-5.2.6.ebuild
+++ b/dev-python/celery/celery-5.3.0_beta1.ebuild
@@ -4,47 +4,53 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-MYPV="${PV/_beta/b}"
-PYTHON_COMPAT=( python3_{8..9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 distutils-r1 optfeature
 
+MY_PV="${PV/_beta/b}"
 DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
 HOMEPAGE="
 	https://docs.celeryproject.org/en/stable/index.html
 	https://pypi.org/project/celery/
 	https://github.com/celery/celery
 "
-SRC_URI="https://github.com/celery/celery/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MYPV}"
+SRC_URI="https://github.com/celery/celery/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-# There are a number of other optional 'extras'
 IUSE="examples"
-#RESTRICT="!test? ( test )"
-RESTRICT="test" # 'celery' not found in `markers` configuration option
 
 RDEPEND="
 	>=dev-python/billiard-3.6.4.0[${PYTHON_USEDEP}]
-	<dev-python/billiard-4.0.0[${PYTHON_USEDEP}]
+	<dev-python/billiard-5.0.0[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-didyoumean[${PYTHON_USEDEP}]
+	dev-python/click-plugins[${PYTHON_USEDEP}]
+	dev-python/click-repl[${PYTHON_USEDEP}]
+	>=dev-python/kombu-5.3.0_beta1[${PYTHON_USEDEP}]
 	<dev-python/kombu-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-5.2.1[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/vine[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	test? (
+		$(python_gen_impl_dep 'ncurses(+)')
 		>=dev-python/boto3-1.9.178[${PYTHON_USEDEP}]
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		dev-python/elasticsearch-py[${PYTHON_USEDEP}]
 		>=dev-python/moto-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.2[${PYTHON_USEDEP}]
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pymongo[${PYTHON_USEDEP}]
 		dev-python/pytest-celery[${PYTHON_USEDEP}]
+		dev-python/pytest-click[${PYTHON_USEDEP}]
 		dev-python/pytest-subtests[${PYTHON_USEDEP}]
 		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
 	)
 	doc? (
 		dev-python/docutils[${PYTHON_USEDEP}]
@@ -55,9 +61,18 @@ DEPEND="
 	)
 "
 
-# testsuite needs it own source
-DISTUTILS_IN_SOURCE_BUILD=1
+EPYTEST_DESELECT=(
+	t/unit/tasks/test_result.py::test_EagerResult::test_wait_raises
+	t/unit/tasks/test_tasks.py::test_task_retries
+	t/unit/tasks/test_tasks.py::test_apply_task::test_apply
+	t/unit/utils/test_collections.py::test_ExceptionInfo::test_exception_info
+	t/unit/worker/test_request.py::test_trace_task::test_execute_jail_failure
+	t/unit/worker/test_request.py::test_Request
+	t/unit/worker/test_request.py::test_create_request_class::test_on_success__SystemExit
+)
+
 distutils_enable_tests pytest
+
 distutils_enable_sphinx docs --no-autodoc
 
 python_install_all() {
@@ -68,7 +83,7 @@ python_install_all() {
 	if use examples; then
 		docinto examples
 		dodoc -r examples/.
-		docompress -x "/usr/share/doc/${PF}/examples"
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
 	newbashcomp extra/bash-completion/celery.bash "${PN}"
@@ -77,16 +92,14 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	optfeature "zookeeper support" dev-python/kazoo
 	optfeature "msgpack support" dev-python/msgpack
 	#optfeature "rabbitmq support" dev-python/librabbitmq
 	#optfeature "slmq support" dev-python/softlayer_messaging
-	optfeature "eventlet support" dev-python/eventlet
 	#optfeature "couchbase support" dev-python/couchbase
-	optfeature "redis support" dev-db/redis dev-python/redis-py
+	optfeature "redis support" dev-python/redis-py
 	optfeature "gevent support" dev-python/gevent
 	optfeature "auth support" dev-python/pyopenssl
-	optfeature "pyro support" dev-python/pyro:4
+	optfeature "pyro support" dev-python/Pyro4
 	optfeature "yaml support" dev-python/pyyaml
 	optfeature "memcache support" dev-python/pylibmc
 	optfeature "mongodb support" dev-python/pymongo

diff --git a/dev-python/celery/files/celery.initd-r2 b/dev-python/celery/files/celery.initd-r2
index 3789dc016..91dd838a6 100644
--- a/dev-python/celery/files/celery.initd-r2
+++ b/dev-python/celery/files/celery.initd-r2
@@ -9,31 +9,30 @@ depend() {
 	use rabbitmq redis logger dns
 }
 
-CELERYD_ENABLED=${CELERYD_ENABLED:-"no"}
-CELERYD_PID_FILE=${CELERYD_PID_FILE:-"/run/celery/celeryd@%n.pid"}
-CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-"/var/log/celery/celeryd@%n.log"}
-CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-"INFO"}
-CELERYD_NODES=${CELERYD_NODES:-"celery"}
+: ${CELERYD_ENABLED:="no"}
+: ${CELERYD_PID_FILE:="/run/celery/celeryd@%n.pid"}
+: ${CELERYD_LOG_FILE:="/var/log/celery/celeryd@%n.log"}
+: ${CELERYD_LOG_LEVEL:="INFO"}
+: ${CELERYD_NODES:="celery"}
 
-CELERYBEAT_ENABLED=${CELERYBEAT_ENABLED:-"no"}
-CELERYBEAT_PID_FILE=${CELERYBEAT_PID_FILE:-"/run/celery/celerybeat.pid"}
-CELERYBEAT_LOG_FILE=${CELERYBEAT_LOG_FILE:-"/var/log/celery/celerybeat.log"}
-CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-"INFO"}
+${CELERYBEAT_ENABLED:="no"}
+${CELERYBEAT_PID_FILE:="/run/celery/celerybeat.pid"}
+${CELERYBEAT_LOG_FILE:="/var/log/celery/celerybeat.log"}
+${CELERYBEAT_LOG_LEVEL:="INFO"}
 
 export CELERY_LOADER
 
-CELERYD_MULTI=${CELERYD_MULTI:-"celery multi"}
-CELERYCTL=${CELERYCTL:-"celery"}
-CELERYBEAT=${CELERYBEAT:-"celery beat"}
+: ${CELERYD_MULTI:="celery multi"}
+: ${CELERYCTL:="celery"}
+: ${CELERYBEAT:="celery beat"}
 
-CELERYD_OPTS="${CELERYD_OPTS}"
 CELERYBEAT_OPTS="${CELERYBEAT_OPTS} -f ${CELERYBEAT_LOG_FILE} -l ${CELERYBEAT_LOG_LEVEL}"
 
 create_dirs() {
-	local logfile="${1}"
-	local pidfile="${2}"
-	local logdir=$(dirname ${logfile})
-	local piddir=$(dirname ${pidfile})
+	logfile="${1}"
+	pidfile="${2}"
+	logdir=$(dirname ${logfile})
+	piddir=$(dirname ${pidfile})
 
 	checkpath -d -q -m 0750 -o ${CELERY_USER:-"root"}:${CELERY_GROUP:-"root"} ${logdir} ${piddir}
 }
@@ -66,9 +65,9 @@ celery_chdir() {
 }
 
 wait_pid () {
-	local pidfile=${1}
-	local timeout=${STOPTIMEOUT:-"10"}
-	local PID=$(cat "${pidfile}" 2>/dev/null)
+	pidfile=${1}
+	timeout=${STOPTIMEOUT:-"10"}
+	PID=$(cat "${pidfile}" 2>/dev/null)
 
 	while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do
 		kill -0 ${PID} 2>/dev/null || break
@@ -96,14 +95,14 @@ start_workers() {
 stop_workers() {
 	yesno "${CELERYD_ENABLED}" || return 0
 
-	local timeout=${STOPTIMEOUT:-"10"}
+	timeout=${STOPTIMEOUT:-"10"}
 
 	${CELERYD_MULTI} stop ${CELERYD_NODES} --pidfile="${CELERYD_PID_FILE}" || return 1
 
 	# Wait for each node
 	for node in ${CELERYD_NODES}; do
-		local pidfile=${CELERYD_PID_FILE/\%n/${node}}
-		local PID=$(cat "${pidfile}" 2>/dev/null)
+		pidfile=$(echo "${CELERYD_PID_FILE}" | sed "s/%n/${node}/g")
+		PID=$(cat "${pidfile}" 2>/dev/null)
 		while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do
 		kill -0 ${PID} 2>/dev/null || break
 		timeout=$((${timeout} - 1))
@@ -150,7 +149,7 @@ stop_beat() {
 
 
 start() {
-	local cr=0
+	cr=0
 
 	checkconfig || return 1
 
@@ -166,7 +165,7 @@ start() {
 }
 
 stop() {
-	local cr=0
+	cr=0
 
 	checkconfig || return 1
 
@@ -182,7 +181,7 @@ stop() {
 }
 
 reload() {
-	local cr=0
+	cr=0
 
 	checkconfig || return 1
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-python/celery/files/, dev-python/celery/
@ 2023-01-19 22:17 Julien Roy
  0 siblings, 0 replies; 3+ messages in thread
From: Julien Roy @ 2023-01-19 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     aadea75f9fc1b0dbce9f61d480fca3d6971ca011
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Thu Jan 19 22:16:34 2023 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Thu Jan 19 22:17:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aadea75f

dev-python/celery: backport sphinx 6.0 patch

Closes: https://bugs.gentoo.org/890883
Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 ...0_beta1.ebuild => celery-5.3.0_beta1-r1.ebuild} | 12 +++------
 .../files/celery-5.3.0_beta1-sphinx-6.0.patch      | 31 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/dev-python/celery/celery-5.3.0_beta1.ebuild b/dev-python/celery/celery-5.3.0_beta1-r1.ebuild
similarity index 95%
rename from dev-python/celery/celery-5.3.0_beta1.ebuild
rename to dev-python/celery/celery-5.3.0_beta1-r1.ebuild
index 9fde77c3d..dc527d4aa 100644
--- a/dev-python/celery/celery-5.3.0_beta1.ebuild
+++ b/dev-python/celery/celery-5.3.0_beta1-r1.ebuild
@@ -34,15 +34,7 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/vine[${PYTHON_USEDEP}]
 "
-# TODO:
-# - dev-python/pyArango
-# - dev-python/couchbase
-# - dev-python/pycouchdb
-# Deprecated test deps (don't add):
-# - eventlet
-# - memcached
-# - python-consul
-# - pydocumentdb
+
 BDEPEND="
 	test? (
 		$(python_gen_impl_dep 'ncurses(+)')
@@ -85,6 +77,8 @@ EPYTEST_DESELECT=(
 	t/unit/worker/test_request.py::test_create_request_class::test_on_success__SystemExit
 )
 
+PATCHES="${FILESDIR}/celery-5.3.0_beta1-sphinx-6.0.patch"
+
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs --no-autodoc

diff --git a/dev-python/celery/files/celery-5.3.0_beta1-sphinx-6.0.patch b/dev-python/celery/files/celery-5.3.0_beta1-sphinx-6.0.patch
new file mode 100644
index 000000000..5d785b9c6
--- /dev/null
+++ b/dev-python/celery/files/celery-5.3.0_beta1-sphinx-6.0.patch
@@ -0,0 +1,31 @@
+From 57acb4d0ecb4fcb55daf3bb2d750aa760a81eec6 Mon Sep 17 00:00:00 2001
+From: Mathias Ertl <mati@er.tl>
+Date: Sat, 24 Dec 2022 10:40:19 +0100
+Subject: [PATCH] return list of nodes to make sphinx extension compatible with
+ Sphinx 6.0
+
+---
+ celery/contrib/sphinx.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/celery/contrib/sphinx.py b/celery/contrib/sphinx.py
+index a3a06479ccf..a5505ff189a 100644
+--- a/celery/contrib/sphinx.py
++++ b/celery/contrib/sphinx.py
+@@ -32,6 +32,7 @@
+ """
+ from inspect import signature
+ 
++from docutils import nodes
+ from sphinx.domains.python import PyFunction
+ from sphinx.ext.autodoc import FunctionDocumenter
+ 
+@@ -75,7 +76,7 @@ class TaskDirective(PyFunction):
+     """Sphinx task directive."""
+ 
+     def get_signature_prefix(self, sig):
+-        return self.env.config.celery_task_prefix
++        return [nodes.Text(self.env.config.celery_task_prefix)]
+ 
+ 
+ def autodoc_skip_member_handler(app, what, name, obj, skip, options):


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-19 22:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-19 22:17 [gentoo-commits] repo/proj/guru:dev commit in: dev-python/celery/files/, dev-python/celery/ Julien Roy
  -- strict thread matches above, loose matches on Subject: below --
2022-10-23 21:04 Anna Vyalkova
2021-05-07 11:31 Alessandro Barbieri

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox