JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pythonPackages.celery: 4.0.2 -> 4.1.0

Browse Source
This commit is contained in:
Lancelot SIX 2018-01-09 11:34:35 +01:00 committed by Frederik Rietdijk
parent 9d69ebe5a8
commit 45b9cf2659
3 changed files with 31 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/python-modules/celery/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect,
pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
}:
buildPythonPackage rec {
pname = "celery";
version = "4.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0dcb0s6kdcd3vc9pwvazngppkdbhwpmpjmghq6rifsld34q3gzvp";
};
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
preCheck = ''
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
LD_PRELOAD=${libredirect}/lib/libredirect.so
'';
postCheck = ''
unset NIX_REDIRECTS LD_PRELOAD
'';
buildInputs = [ pytest case ];
propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];
meta = with stdenv.lib; {
homepage = https://github.com/celery/celery/;
description = "Distributed task queue";
license = licenses.bsd3;
};
}

18
pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch
View File

@ -1,18 +0,0 @@
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

34
pkgs/top-level/python-packages.nix
View File

@ -2231,39 +2231,7 @@ in {
'';
};
celery = buildPythonPackage rec {
name = "celery-${version}";
version = "4.0.2";
src = pkgs.fetchurl {
url = "mirror://pypi/c/celery/${name}.tar.gz";
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 ];
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
preCheck = ''
export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \
LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so
'';
postCheck = ''
unset NIX_REDIRECTS LD_PRELOAD
'';
buildInputs = with self; [ pytest case ];
propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ];
meta = {
homepage = https://github.com/celery/celery/;
description = "Distributed task queue";
license = licenses.bsd3;
};
};
celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; };
cerberus = buildPythonPackage rec {
name = "Cerberus-${version}";