Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c357b537630e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bc3e7f875ee3
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 19, 2019

  1. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    bc3e7f8 View commit details
Showing with 45 additions and 1 deletion.
  1. +39 −0 pkgs/development/python-modules/priority/deadline.patch
  2. +6 −1 pkgs/development/python-modules/priority/default.nix
39 changes: 39 additions & 0 deletions pkgs/development/python-modules/priority/deadline.patch
Original file line number Diff line number Diff line change
@@ -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

7 changes: 6 additions & 1 deletion pkgs/development/python-modules/priority/default.nix
Original file line number Diff line number Diff line change
@@ -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