diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-19 21:28:54 +0000 |
---|---|---|
committer | Robert Schütz <rschuetz17@gmail.com> | 2019-03-19 22:28:54 +0100 |
commit | bc3e7f875ee30238fac06b92046e7a26b382ed0f (patch) | |
tree | 822c8bff1cbcedf1f72a97f931730b572482c542 /pkgs | |
parent | c357b537630e037c30e13738138ec42ec594ce12 (diff) | |
download | nixlib-bc3e7f875ee30238fac06b92046e7a26b382ed0f.tar nixlib-bc3e7f875ee30238fac06b92046e7a26b382ed0f.tar.gz nixlib-bc3e7f875ee30238fac06b92046e7a26b382ed0f.tar.bz2 nixlib-bc3e7f875ee30238fac06b92046e7a26b382ed0f.tar.lz nixlib-bc3e7f875ee30238fac06b92046e7a26b382ed0f.tar.xz nixlib-bc3e7f875ee30238fac06b92046e7a26b382ed0f.tar.zst nixlib-bc3e7f875ee30238fac06b92046e7a26b382ed0f.zip |
python3Packages.priority: fix build (#57807)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/priority/deadline.patch | 39 | ||||
-rw-r--r-- | pkgs/development/python-modules/priority/default.nix | 7 |
2 files changed, 45 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/priority/deadline.patch b/pkgs/development/python-modules/priority/deadline.patch new file mode 100644 index 000000000000..174dbc2b199c --- /dev/null +++ b/pkgs/development/python-modules/priority/deadline.patch @@ -0,0 +1,39 @@ +From 9d933c3c6535c1c63291e3d35f4ada9135d422df Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Mon, 11 Mar 2019 02:08:43 +0000 +Subject: [PATCH] Allow test_period_of_repetition to be slow + +Recent versions of hypothesis default to a 200ms timeout, which wasn't +enough for my Thinkpad X220 to run this test. I've increased the timeout +for this single test to hopefully a reasonable amount for older +hardware. + +(cherry picked from commit 752beb3a32b59f54168816da531c9d2a387f9715) +--- + test/test_priority.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/test_priority.py b/test/test_priority.py +index c98a28d..013ce30 100644 +--- a/test/test_priority.py ++++ b/test/test_priority.py +@@ -12,7 +12,7 @@ import itertools + + import pytest + +-from hypothesis import given ++from hypothesis import given, settings + from hypothesis.strategies import ( + integers, lists, tuples, sampled_from + ) +@@ -489,6 +489,7 @@ class TestPriorityTreeOutput(object): + fairness and equidistribution. + """ + @given(STREAMS_AND_WEIGHTS) ++ @settings(deadline=None) + def test_period_of_repetition(self, streams_and_weights): + """ + The period of repetition of a priority sequence is given by the sum of +-- +2.19.2 + diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index 90b58b665de8..f2f7a935cc41 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, hypothesis }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, hypothesis }: buildPythonPackage rec { pname = "priority"; @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb"; }; + patches = [ + # https://github.com/python-hyper/priority/pull/135 + ./deadline.patch + ]; + checkInputs = [ pytest hypothesis ]; checkPhase = '' PYTHONPATH="src:$PYTHONPATH" pytest |