From 9285605ae83b90ebf1bb0f4b3546d3b68c212b46 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 17 Mar 2017 02:19:38 -0700 Subject: [PATCH] dev-python/celery: Add python3_6 to PYTHON_COMPAT Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- dev-python/celery/celery-4.0.2.ebuild | 8 +++++-- .../files/celery-4.0.2-log-endless-loop.patch | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 dev-python/celery/files/celery-4.0.2-log-endless-loop.patch diff --git a/dev-python/celery/celery-4.0.2.ebuild b/dev-python/celery/celery-4.0.2.ebuild index ba176e4ff47d..83b0e06fec06 100644 --- a/dev-python/celery/celery-4.0.2.ebuild +++ b/dev-python/celery/celery-4.0.2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit distutils-r1 bash-completion-r1 @@ -49,12 +49,16 @@ DEPEND=" >=dev-python/sphinx_celery-1.3[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] dev-python/sqlalchemy[${PYTHON_USEDEP}] - dev-python/typing[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7 python3_4) )" # testsuite needs it own source DISTUTILS_IN_SOURCE_BUILD=1 +PATCHES=( + "${FILESDIR}"/${P}-log-endless-loop.patch + ) + python_compile_all() { if use doc; then mkdir docs/.build || die diff --git a/dev-python/celery/files/celery-4.0.2-log-endless-loop.patch b/dev-python/celery/files/celery-4.0.2-log-endless-loop.patch new file mode 100644 index 000000000000..bf9396e45a39 --- /dev/null +++ b/dev-python/celery/files/celery-4.0.2-log-endless-loop.patch @@ -0,0 +1,22 @@ +From 9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad Mon Sep 17 00:00:00 2001 +From: George Psarakis +Date: Mon, 23 Jan 2017 11:49:38 +0200 +Subject: [PATCH] AWS DynamoDB result backend (#3736) + +* Fix endless loop in logger_isa (Python 3.6) + +https://github.com/celery/celery/pull/3736#issuecomment-274155454 + +diff --git a/celery/utils/log.py b/celery/utils/log.py +index 2fb15e6..00df476 100644 +--- a/celery/utils/log.py ++++ b/celery/utils/log.py +@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000): + else: + if this in seen: + raise RuntimeError( +- 'Logger {0!r} parents recursive'.format(l), ++ 'Logger {0!r} parents recursive'.format(l.name), + ) + seen.add(this) + this = this.parent -- 2.26.2