about summary refs log tree commit diff
path: root/pkgs/development/python-modules/txaio/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-04-11 14:55:52 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-04-11 14:55:52 +0200
commitee6894ca1297afe0caf2f389c1f9a9220826b749 (patch)
tree02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/development/python-modules/txaio/default.nix
parent392874b9b1411dc7b879997bd8776b921feea61d (diff)
parent617c26df84d5670574864a9ccad0eaf8708bd86a (diff)
downloadnixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar
nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz
nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2
nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz
nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz
nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst
nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip
Merge staging into master
Diffstat (limited to 'pkgs/development/python-modules/txaio/default.nix')
-rw-r--r--pkgs/development/python-modules/txaio/default.nix15
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index b4662c640a35..4abd97d24362 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -1,27 +1,20 @@
 { stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "txaio";
-  version = "2.8.2";
+  version = "2.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "484cd6c4cdd3f6081b87188f3b2b9a36e02fba6816e8256917c4f6571b567571";
+    sha256 = "dfc3a7d04b4b484ae5ff241affab5bb01306b1e950dd6f54fd036cfca94345d0";
   };
 
-  buildInputs = [ pytest mock ];
+  checkInputs = [ pytest mock ];
 
   propagatedBuildInputs = [ six twisted ];
 
-  patchPhase = ''
-    sed -i '152d' test/test_logging.py
-  '';
-
-  # test_chained_callback has been removed just post-2.7.1 because the functionality was decided against and the test
-  # breaks on python 3.6 https://github.com/crossbario/txaio/pull/104
   checkPhase = ''
-    py.test -k "not (test_sdist or test_chained_callback)"
+    py.test -k "not test_sdist"
   '';
 
   meta = with stdenv.lib; {