From 04e479003357c7b3053a74da16fea7211530c234 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Jan 2017 14:11:45 +0100 Subject: [PATCH 1/7] pythonPackages.case: init at 1.5.2 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac5bac79f97..aa278bfccf0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3476,6 +3476,25 @@ in { meta.maintainers = with maintainers; [ garbas ]; }; + case = buildPythonPackage rec { + name = "case-${version}"; + version = "1.5.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/case/${name}.tar.gz"; + sha256 = "1zbhbw87izcxj9rvqg432a7r69ps2ks20mqq3g3hgd42sckcy3ca"; + }; + + propagatedBuildInputs = with self; [ six nose unittest2 mock ]; + + meta = { + homepage = https://github.com/celery/case; + description = "unittests utilities"; + license = licenses.bsd3; + }; + + }; + cassandra-driver = buildPythonPackage rec { name = "cassandra-driver-3.6.0"; From ece1154382bbe4d3bd51e60f09aa85e00057b4f3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Jan 2017 14:18:42 +0100 Subject: [PATCH 2/7] pythonPackages.vine: init at 1.1.3 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa278bfccf0..cf33d0c1d35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31911,6 +31911,26 @@ EOF urlscan = callPackage ../applications/misc/urlscan { }; + vine = buildPythonPackage rec { + name = "vine-${version}"; + version = "1.1.3"; + + disable = pythonOlder "2.7"; + + src = pkgs.fetchurl { + url = "mirror://pypi/v/vine/${name}.tar.gz"; + sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7"; + }; + + buildInputs = with self; [ case pytest_30 ]; + + meta = { + homepage = https://github.com/celery/vine; + description = "python promises"; + license = licenses.bsd3; + }; + }; + wp_export_parser = buildPythonPackage rec { name = "${pname}-${version}"; pname = "wp_export_parser"; From a272ca2c2efd89027072b346d81da9fef1eb9963 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Jan 2017 14:19:22 +0100 Subject: [PATCH 3/7] pythonPackages.amqp: 1.4.9 -> 2.1.4 --- pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf33d0c1d35..70ce93f663c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -864,8 +864,7 @@ in { }; }; - - amqp = buildPythonPackage rec { + amqp_1 = buildPythonPackage rec { name = "amqp-${version}"; version = "1.4.9"; disabled = pythonOlder "2.6"; @@ -884,6 +883,26 @@ in { }; }; + amqp = buildPythonPackage rec { + name = "amqp-${version}"; + version = "2.1.4"; + disabled = pythonOlder "2.6"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/amqp/${name}.tar.gz"; + sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k"; + }; + + buildInputs = with self; [ pytest_30 case ]; + propagatedBuildInputs = with self; [ vine ]; + + meta = { + homepage = http://github.com/celery/py-amqp; + description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; + license = licenses.lgpl21; + }; + }; + amqplib = buildPythonPackage rec { name = "amqplib-0.6.1"; @@ -3556,7 +3575,7 @@ in { }; buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp ]; + propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp_1 ]; checkPhase = '' nosetests $out/${python.sitePackages}/celery/tests/ @@ -13614,7 +13633,7 @@ in { # most of these are simply to allow the test suite to do its job buildInputs = with self; optionals isPy27 [ mock unittest2 nose redis qpid-python pymongo sqlalchemy pyyaml msgpack boto ]; - propagatedBuildInputs = with self; [ amqp anyjson ] ++ + propagatedBuildInputs = with self; [ amqp_1 anyjson ] ++ (optionals (pythonOlder "2.7") [ importlib ordereddict ]); # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 From 0be9f1b3e511dd43c3ed75ad0e31bbac9b5e71e3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Jan 2017 14:19:52 +0100 Subject: [PATCH 4/7] pythonPackages.billiard: 3.3.0.23 -> 3.5.0.2 --- pkgs/top-level/python-packages.nix | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70ce93f663c..818adea68e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2668,8 +2668,7 @@ in { }; }; - - billiard = buildPythonPackage rec { + billiard_33 = buildPythonPackage rec { name = "billiard-${version}"; version = "3.3.0.23"; @@ -2689,6 +2688,26 @@ in { }; }; + billiard = buildPythonPackage rec { + name = "billiard-${version}"; + version = "3.5.0.2"; + + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "mirror://pypi/b/billiard/${name}.tar.gz"; + sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; + }; + + buildInputs = with self; [ pytest_30 case ]; + + meta = { + homepage = https://github.com/celery/billiard; + description = "Python multiprocessing fork with improvements and bugfixes"; + license = licenses.bsd3; + }; + }; + binaryornot = buildPythonPackage rec { name = "binaryornot-${version}"; @@ -3575,7 +3594,7 @@ in { }; buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp_1 ]; + propagatedBuildInputs = with self; [ kombu billiard_33 pytz anyjson amqp_1 ]; checkPhase = '' nosetests $out/${python.sitePackages}/celery/tests/ From 67a8210d6ad04ecdf3ffc355bac6695b0463d2c6 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Jan 2017 14:20:19 +0100 Subject: [PATCH 5/7] pythonPackages.kombu: 3.0.35 -> 4.0.2 --- pkgs/top-level/python-packages.nix | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 818adea68e3..34a6b732ed2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3594,7 +3594,7 @@ in { }; buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = with self; [ kombu billiard_33 pytz anyjson amqp_1 ]; + propagatedBuildInputs = with self; [ kombu_3 billiard_33 pytz anyjson amqp_1 ]; checkPhase = '' nosetests $out/${python.sitePackages}/celery/tests/ @@ -13638,7 +13638,7 @@ in { koji = callPackage ../development/python-modules/koji { }; - kombu = buildPythonPackage rec { + kombu_3 = buildPythonPackage rec { name = "kombu-${version}"; version = "3.0.35"; @@ -13665,6 +13665,26 @@ in { }; }; + kombu = buildPythonPackage rec { + name = "kombu-${version}"; + version = "4.0.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/k/kombu/${name}.tar.gz"; + sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h"; + }; + + buildInputs = with self; [ pytest_30 case pytz ]; + + propagatedBuildInputs = with self; [ amqp ]; + + meta = { + description = "Messaging library for Python"; + homepage = "http://github.com/celery/kombu"; + license = licenses.bsd3; + }; + }; + konfig = buildPythonPackage rec { name = "konfig-${version}"; version = "0.9"; @@ -17015,7 +17035,7 @@ in { propagatedBuildInputs = with self; [ pbr oslo-config oslo-context oslo-log oslo-utils oslo-serialization - oslo-i18n stevedore six eventlet greenlet webob pyyaml kombu trollius + oslo-i18n stevedore six eventlet greenlet webob pyyaml kombu_3 trollius aioeventlet cachetools oslo-middleware futurist redis oslo-service eventlet pyzmq ]; From cdf3b50917382cd6b54f35a7ade053064fcc38d1 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Jan 2017 14:23:25 +0100 Subject: [PATCH 6/7] pythonPackages.celery: 3.1.23 -> 4.0.2 --- pkgs/top-level/python-packages.nix | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34a6b732ed2..5e5be3019fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3581,8 +3581,7 @@ in { }; }; - - celery = buildPythonPackage rec { + celery_3 = buildPythonPackage rec { name = "celery-${version}"; version = "3.1.23"; @@ -3607,6 +3606,25 @@ in { }; }; + celery = buildPythonPackage rec { + name = "celery-${version}"; + version = "4.0.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/celery/${name}.tar.gz"; + sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3"; + }; + + buildInputs = with self; [ pytest_30 case ]; + propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; + + meta = { + homepage = https://github.com/celery/celery/; + description = "Distributed task queue"; + license = licenses.bsd3; + }; + }; + cerberus = buildPythonPackage rec { name = "Cerberus-${version}"; version = "0.9.2"; @@ -10577,7 +10595,7 @@ in { }; propagatedBuildInputs = with self ; [ numpy django_colorful pillow psycopg2 - pyparsing django celery ]; + pyparsing django celery_3 ]; meta = { description = "Basic raster data integration for Django"; From c71087b345096232564f46810f061482b480ccd2 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Jan 2017 14:23:44 +0100 Subject: [PATCH 7/7] pythonPackages.pytest_30: 3.0.4 -> 3.0.5 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e5be3019fc..c2eb404049c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5042,12 +5042,12 @@ in { }; pytest_30 = self.pytest_27.override rec { - name = "pytest-3.0.4"; + name = "pytest-3.0.5"; propagatedBuildInputs = with self; [ hypothesis py ]; src = pkgs.fetchurl { url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "03d49xc0l4sdncq47rn1p42ywjnxqrvpc160y8dwvanv3wnfx7w7"; + sha256 = "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a"; }; };