summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2016-03-28 14:00:39 +0000
committerRobert Scott <code@humanleg.org.uk>2016-03-28 14:28:50 +0000
commit364b3d2453ae33bb87b410bc3eae4de70a02364c (patch)
treec2f94ea5e02fa6a6eb9c53121e3e23dbb93acbc6
parent86435a1b41a35daa09bb0ea15593cba16dcc27d9 (diff)
downloadnixpkgs-364b3d2453ae33bb87b410bc3eae4de70a02364c.tar
nixpkgs-364b3d2453ae33bb87b410bc3eae4de70a02364c.tar.gz
nixpkgs-364b3d2453ae33bb87b410bc3eae4de70a02364c.tar.bz2
nixpkgs-364b3d2453ae33bb87b410bc3eae4de70a02364c.tar.lz
nixpkgs-364b3d2453ae33bb87b410bc3eae4de70a02364c.tar.xz
nixpkgs-364b3d2453ae33bb87b410bc3eae4de70a02364c.tar.zst
nixpkgs-364b3d2453ae33bb87b410bc3eae4de70a02364c.zip
kombu: tidy up, removing py3k fussiness which is handled by the deps and adding to buildInputs to allow more of the test suite to run
-rw-r--r--pkgs/top-level/python-packages.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8b487ec0daf..d0bbe1bb370 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11028,14 +11028,14 @@ in modules // {
       sha256 = "09xpxpjz9nk8d14dj361dqdwyjwda3jlf1a7v6jif9wn2xm37ar2";
     };
 
-    buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose redis ];
+    # most of these are simply to allow the test suite to do its job
+    buildInputs = with self; [ mock unittest2 nose redis qpid-python pymongo sqlalchemy pyyaml msgpack boto ];
 
     propagatedBuildInputs = with self; [ amqp anyjson ] ++
       (optionals (pythonOlder "2.7") [ importlib ordereddict ]);
 
     # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806
-    # tests also appear to depend on anyjson, which has Py3k problems
-    doCheck = (pythonAtLeast "2.7") && !isPy3k ;
+    doCheck = (pythonAtLeast "2.7");
 
     meta = {
       description = "Messaging library for Python";