From d0f75408854cf7d9c30009733ace300d9d98e568 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 26 Oct 2019 15:46:50 -0700 Subject: [PATCH] pythonPackages.testfixtures: 6.3.10 -> 6.10.0 --- .../python-modules/testfixtures/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index f9d35297306c..a08241332dcf 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,25 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch -, mock, pytest, sybil, zope_component }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy27 +, mock, pytest, sybil, zope_component, twisted }: buildPythonPackage rec { pname = "testfixtures"; - version = "6.3.0"; + version = "6.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1x16xkw483nb1ngv74s7lgaj514pb1ldklal7kb7iwqbxcgnrh2k"; + sha256 = "1kiv60i0s67v34x28j6cshby7n7mbhd7a7val639yvvlh1f0q8wx"; }; - checkInputs = [ pytest mock sybil zope_component ]; - - patches = [ - # Fix tests for Python 3.7. Remove with the next release - (fetchpatch { - url = https://github.com/Simplistix/testfixtures/commit/6e8807543b804946aba58e2c9e92f5bdc3656a57.patch; - sha256 = "1584jz2qz04arx8z8f6d1l1vab7gi38k3akzm223rmp7j4m7yrii"; - }) - ]; + checkInputs = [ pytest mock sybil zope_component twisted ]; + doCheck = !isPy27; checkPhase = '' # django is too much hasle to setup at the moment pytest -W ignore::DeprecationWarning --ignore=testfixtures/tests/test_django testfixtures/tests