diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2017-07-12 12:29:59 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-17 14:23:48 +0200 |
| commit | f7179c04747f4594416a63d499f3f3dae6c88aec (patch) | |
| tree | aab503df7535c6a5e7afd56f30964499a8195911 /pkgs | |
| parent | a8dd4d8e538fbb6fea9e2e0af14f057817d53d72 (diff) | |
| download | nixlib-f7179c04747f4594416a63d499f3f3dae6c88aec.tar nixlib-f7179c04747f4594416a63d499f3f3dae6c88aec.tar.gz nixlib-f7179c04747f4594416a63d499f3f3dae6c88aec.tar.bz2 nixlib-f7179c04747f4594416a63d499f3f3dae6c88aec.tar.lz nixlib-f7179c04747f4594416a63d499f3f3dae6c88aec.tar.xz nixlib-f7179c04747f4594416a63d499f3f3dae6c88aec.tar.zst nixlib-f7179c04747f4594416a63d499f3f3dae6c88aec.zip | |
pythonPackages.celery: fix tests for python3.6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch | 18 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch new file mode 100644 index 000000000000..27caa80dd4ca --- /dev/null +++ b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch @@ -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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 14945f722993..39f4da0012cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 ]; |