Merge pull request #237253 from mweinelt/celery-5.3.0
python310Packages.celery: 5.2.7 -> 5.3.0; python310Packages.kombu: 5.2.4 -> 5.3.0
This commit is contained in:
commit
b64b893fad
|
@ -1,38 +1,48 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python-dateutil
|
||||
, celery
|
||||
, redis
|
||||
, tenacity
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
, fakeredis
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "celery-redbeat";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sibson";
|
||||
repo = "redbeat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pu4umhfNFZ30bQu5PcT2LYN4WGzFj4p4/qHm3pVIV+c=";
|
||||
hash = "sha256-WW/OYa7TWEKkata1eULir29wHaCnavBJebn4GrBzmWY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# celery 5.3.0 support
|
||||
url = "https://github.com/sibson/redbeat/commit/4240e17172a4d9d2744d5c4da3cfca0e0a024e2e.patch";
|
||||
hash = "sha256-quEfSFhv0sIpsKHX1CpFhbMC8LYXA8NASWYU8MMYPSk=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
celery
|
||||
python-dateutil
|
||||
redis
|
||||
tenacity
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
fakeredis
|
||||
mock
|
||||
pytestCheckHook
|
||||
pytz
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "redbeat" ];
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, backports-zoneinfo
|
||||
, billiard
|
||||
, boto3
|
||||
, buildPythonPackage
|
||||
|
@ -10,50 +11,33 @@
|
|||
, click-repl
|
||||
, dnspython
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, kombu
|
||||
, moto
|
||||
, pymongo
|
||||
, pytest-celery
|
||||
, pytest-click
|
||||
, pytest-subtests
|
||||
, pytest-timeout
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, tzdata
|
||||
, vine
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "celery";
|
||||
version = "5.2.7";
|
||||
version = "5.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+vvYKTTTD4oAT4Ho96Bi4xQToj1ES+juMyZVORWVjG0=";
|
||||
hash = "sha256-Hqul7hTYyMC+2PYGPl4Q2r288jUDqGHPDhC3Ih2Zyw0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "billiard-4.0-compat.patch";
|
||||
url = "https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch";
|
||||
hash = "sha256-NWB/UB0fE7A/vgMRYz6QGmqLmyN1ninAMyL4V2tpzto=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "billiard-4.1-compat.patch";
|
||||
url = "https://github.com/celery/celery/pull/7781/commits/879af6341974c3778077d8212d78f093b2d77a4f.patch";
|
||||
hash = "sha256-+m8/YkeAPPjwm0WF7dw5XZzf7MImVBLXT0/FS+fk0FE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements/default.txt \
|
||||
--replace "billiard>=3.6.4.0,<4.0" "billiard>=3.6.4.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
billiard
|
||||
click
|
||||
|
@ -61,8 +45,12 @@ buildPythonPackage rec {
|
|||
click-plugins
|
||||
click-repl
|
||||
kombu
|
||||
pytz
|
||||
python-dateutil
|
||||
tzdata
|
||||
vine
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.9") [
|
||||
backports-zoneinfo
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
@ -72,6 +60,7 @@ buildPythonPackage rec {
|
|||
moto
|
||||
pymongo
|
||||
pytest-celery
|
||||
pytest-click
|
||||
pytest-subtests
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
{ lib
|
||||
, amqp
|
||||
, azure-identity
|
||||
, azure-servicebus
|
||||
, backports-zoneinfo
|
||||
, buildPythonPackage
|
||||
, cached-property
|
||||
, case
|
||||
, fetchPypi
|
||||
, hypothesis
|
||||
, importlib-metadata
|
||||
, pyro4
|
||||
, pytestCheckHook
|
||||
|
@ -15,14 +18,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "kombu";
|
||||
version = "5.2.4";
|
||||
version = "5.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-N87j7nJflOqLsXPqq3wXYCA+pTu+uuImMoYA+dJ5lhA=";
|
||||
hash = "sha256-0ITsH5b3p8N7qegWgjvbwI8Px92zpb5VWAXmkhAil9g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -33,14 +36,18 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
amqp
|
||||
vine
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
backports-zoneinfo
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
cached-property
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
azure-identity
|
||||
azure-servicebus
|
||||
case
|
||||
hypothesis
|
||||
pyro4
|
||||
pytestCheckHook
|
||||
pytz
|
||||
|
|
Loading…
Reference in a new issue