1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

pythonPackages.celery: fix tests for python3.6

This commit is contained in:
Lancelot SIX 2017-07-12 12:29:59 +02:00 committed by Frederik Rietdijk
parent a8dd4d8e53
commit f7179c0474
2 changed files with 24 additions and 0 deletions

View file

@ -0,0 +1,18 @@
Description: Fix endless loop in logger_isa (Python 3.6)
Author: George Psarakis <giwrgos.psarakis@gmail.com>
Origin: upstream, https://github.com/celery/celery/commit/9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad
Forwarded: not-needed
Reviewed-By: Nishanth Aravamudan <nish.aravamudan@canonical.com>
Last-Update: 2017-06-12
--- celery-4.0.2.orig/celery/utils/log.py
+++ celery-4.0.2/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

View file

@ -3272,6 +3272,12 @@ in {
sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3";
};
# Fixes testsuite for python-3.6
# From ubuntu packaging: https://launchpad.net/ubuntu/+archive/primary/+files/celery_4.0.2-0ubuntu1.debian.tar.xz
# (linked from https://launchpad.net/ubuntu/+source/celery)
# https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream
patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ];
buildInputs = with self; [ pytest case ];
propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ];