From 3970bfdd294d9e80fdc1b3eedb097bcc25cf97b0 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 11:54:35 +0100 Subject: [PATCH 01/11] python-packages: add python3-pika-0.9.14 --- pkgs/top-level/python-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 614152b689cf..44b730540361 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7368,6 +7368,20 @@ let propagatedBuildInputs = with self; [ unittest2 ]; }; + + python3pika = buildPythonPackage { + name = "python3-pika-0.9.14"; + disabled = !isPy3k; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/p/python3-pika/python3-pika-0.9.14.tar.gz; + md5 = "f3a3ee58afe0ae06f1fa553710e1aa28"; + }; + buildInputs = with self; [ nose mock pyyaml ]; + + propagatedBuildInputs = with self; [ unittest2 ]; + }; + + pil = buildPythonPackage rec { name = "PIL-${version}"; version = "1.1.7"; From 56a8ab137c7e29626ffab5ca7ba289a1c24bdab4 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 13:39:42 +0100 Subject: [PATCH 02/11] python-packages: add ddt-1.0.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44b730540361..e89ea9d476f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3741,6 +3741,23 @@ let }; }; + ddt = buildPythonPackage (rec { + name = "ddt-1.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/ddt/${name}.tar.gz"; + md5 = "29688456f9ee42d09d7d7c864ce6e17b"; + }; + + meta = { + description = "Data-Driven/Decorated Tests, a library to multiply test cases"; + + homepage = https://github.com/txels/ddt; + + license = stdenv.lib.licenses.mit; + }; + }); + distutils_extra = buildPythonPackage rec { name = "distutils-extra-2.26"; From 1fe1f730890218443fd2119b9a68a158da2d5f6a Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 13:41:43 +0100 Subject: [PATCH 03/11] python-packages: add falcon-0.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 e89ea9d476f6..66643da7f0d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4467,6 +4467,25 @@ let }; }); + falcon = buildPythonPackage (rec { + name = "falcon-0.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/falcon/${name}.tar.gz"; + md5 = "bf9e8bdd20700f1ff7ce6397cd441fbd"; + }; + + propagatedBuildInputs = with self; [ coverage ddt nose pyyaml requests2 six testtools python_mimeparse ]; + + meta = { + description = "An unladen web framework for building APIs and app backends"; + + homepage = http://falconframework.org; + + license = stdenv.lib.licenses.asl20; + }; + }); + flup = buildPythonPackage (rec { name = "flup-1.0.2"; disabled = isPy3k; From 4607e0711c759069294b72ad5b29167575daa892 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 14:04:33 +0100 Subject: [PATCH 04/11] python-packages: add nosexcover-1.0.10 --- 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 66643da7f0d1..989af085f0f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6658,6 +6658,25 @@ let doCheck = false; }); + nosexcover = buildPythonPackage (rec { + name = "nosexcover-1.0.10"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/nosexcover/${name}.tar.gz"; + md5 = "12bf494a801b376debeb6a167c247391"; + }; + + propagatedBuildInputs = with self; [ coverage nose ]; + + meta = { + description = "Extends nose.plugins.cover to add Cobertura-style XML reports"; + + homepage = http://github.com/cmheisel/nose-xcover/; + + license = stdenv.lib.licenses.bsd3; + }; + }); + nosejs = buildPythonPackage { name = "nosejs-0.9.4"; src = pkgs.fetchurl { From d480e062629cc6710643e6ad9c94c80afc2f8dfd Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 14:33:50 +0100 Subject: [PATCH 05/11] python-packages: add pyaml-15.02.1 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 989af085f0f2..76c14eb7c9e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9101,6 +9101,24 @@ let }); + pyaml = buildPythonPackage (rec { + name = "pyaml-15.02.1"; + disabled = !isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyaml/${name}.tar.gz"; + md5 = "e98cf27f50b9ca291ca4937c135db1c9"; + }; + + buildInputs = with self; [ pyyaml ]; + + meta = { + description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; + homepage = https://github.com/mk-fg/pretty-yaml; + }; + }); + + pyyaml = buildPythonPackage (rec { name = "PyYAML-3.10"; From 94024b4c7d9f216dff2a8c069c07276f8e1ff17c Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 14:58:09 +0100 Subject: [PATCH 06/11] python-packages: add elasticsearch-1.4.0 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76c14eb7c9e6..c57d7f3ba8c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2550,6 +2550,28 @@ let }; + elasticsearch = buildPythonPackage (rec { + name = "elasticsearch-1.4.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/e/elasticsearch/${name}.tar.gz"; + md5 = "14a758debd2296d923cb6c958db98eba"; + }; + + # Check is disabled because running them destroy the content of the local cluster! + # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch + doCheck = false; + + meta = { + description = "Official low-level client for Elasticsearch"; + + homepage = https://github.com/elasticsearch/elasticsearch-py; + + license = stdenv.lib.licenses.asl20; + }; + }); + + evdev = buildPythonPackage rec { version = "0.4.6"; name = "evdev-${version}"; From 486ee6e2523dd0a3bee54ea60e27ee0538740eb4 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 16:08:21 +0100 Subject: [PATCH 07/11] python-packages: update coverage-3.6 to 3.7 --- 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 c57d7f3ba8c6..1d18798f4bda 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1766,11 +1766,11 @@ let }; coverage = buildPythonPackage rec { - name = "coverage-3.6"; + name = "coverage-3.7"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; - md5 = "67d4e393f4c6a5ffc18605409d2aa1ac"; + md5 = "c47b36ceb17eaff3ecfab3bcd347d0df"; }; meta = { From 37a90efc455ca7c7c81bd055a0301b83af81bcbb Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 17:05:53 +0100 Subject: [PATCH 08/11] python-packages: update cov-core-1.7 to 1.15.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d18798f4bda..4e474376f872 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1781,10 +1781,10 @@ let }; covCore = buildPythonPackage rec { - name = "cov-core-1.7"; + name = "cov-core-1.15.0"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/c/cov-core/cov-core-1.7.tar.gz"; - md5 = "59c1e22e636633e10120beacbf45b28c"; + url = "http://pypi.python.org/packages/source/c/cov-core/${name}.tar.gz"; + md5 = "f519d4cb4c4e52856afb14af52919fe6"; }; meta = { description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; From 70eb7cf0120e9ae0b5088277f29581ba6a0500b9 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 17:17:01 +0100 Subject: [PATCH 09/11] python-packages: add pytest-cov-1.8.1 --- 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 4e474376f872..6fc91187b8cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2007,6 +2007,25 @@ let }; }; + pytestcov = buildPythonPackage (rec { + name = "pytest-cov-1.8.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-cov/${name}.tar.gz"; + md5 = "76c778afa2494088270348be42d759fc"; + }; + + buildInputs = with self; [ covCore pytest ]; + + meta = { + description = "py.test plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; + + homepage = https://github.com/schlamar/pytest-cov; + + license = stdenv.lib.licenses.mit; + }; + }); + pytest_xdist = buildPythonPackage rec { name = "pytest-xdist-1.8"; From a80e6b0eca31a4e52ffe684c39cc0b6fb3c5551b Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 17:25:28 +0100 Subject: [PATCH 10/11] python-packages: add elasticsearch-dsl-0.0.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 6fc91187b8cd..8f0ab4df11e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2591,6 +2591,26 @@ let }); + elasticsearchdsl = buildPythonPackage (rec { + name = "elasticsearch-dsl-0.0.3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/e/elasticsearch-dsl/${name}.tar.gz"; + md5 = "6cbc9ed7aefb3ef804be4e3b318b2570"; + }; + + buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov urllib3 ]; + + meta = { + description = "Python client for Elasticsearch"; + + homepage = https://github.com/elasticsearch/elasticsearch-dsl-py; + + license = stdenv.lib.licenses.asl20; + }; + }); + + evdev = buildPythonPackage rec { version = "0.4.6"; name = "evdev-${version}"; From 053122def0fe0816d78dc8d890bd8e5ebc4b207e Mon Sep 17 00:00:00 2001 From: desiderius Date: Fri, 27 Feb 2015 12:42:05 +0100 Subject: [PATCH 11/11] python-packages: disables the test phase for elasticsearch-dsl The test fails with: ImportError: No module named test_elasticsearch_dsl --- pkgs/top-level/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f0ab4df11e6..91e95f41aea0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2599,7 +2599,10 @@ let md5 = "6cbc9ed7aefb3ef804be4e3b318b2570"; }; - buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov urllib3 ]; + buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 ]; + + # ImportError: No module named test_elasticsearch_dsl + doCheck = false; meta = { description = "Python client for Elasticsearch";