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: c2694ef30d94
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f4c238ea5e1
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 29, 2020

  1. python3Packages.pytest-timeout: 1.3.3 -> 1.4.2 

    * Update version
* switch to pytestCheckHook
* Update meta: hompage & changelog
* explicit runtime dependency on pytest

Based on work by @jpgu-epam in #97527.
    @drewrisinger
    drewrisinger authored and Jonathan Ringer committed Oct 29, 2020
    Copy the full SHA
    5f4c238 View commit details
Showing with 19 additions and 17 deletions.
  1. +19 −17 pkgs/development/python-modules/pytest-timeout/default.nix
36 changes: 19 additions & 17 deletions pkgs/development/python-modules/pytest-timeout/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, lib
, pexpect
, pytest
, pytestCheckHook
, pexpect
, pytestcov
}:

buildPythonPackage rec {
pname = "pytest-timeout";
version = "1.3.3";
version = "1.4.2";

src = fetchPypi {
inherit pname version;
sha256 = "1cczcjhw4xx5sjkhxlhc5c1bkr7x6fcyx12wrnvwfckshdvblc2a";
sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0";
};

patches = fetchpatch {
url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw";
sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46";
};
propagatedBuildInputs = [ pytest ];

checkInputs = [ pytestCheckHook pexpect pytestcov ];

checkInputs = [ pytest pexpect ];
checkPhase = ''
# test_suppresses_timeout_when_pdb_is_entered fails under heavy load
pytest -ra -k 'not test_suppresses_timeout_when_pdb_is_entered'
'';
disabledTests = [
"test_suppresses_timeout_when_pdb_is_entered"
];
pytestFlagsArray = [
"-ra"
];

meta = with lib;{
meta = with lib; {
description = "py.test plugin to abort hanging tests";
homepage = "https://bitbucket.org/pytest-dev/pytest-timeout/";
homepage = "https://github.com/pytest-dev/pytest-timeout/";
changelog = "https://github.com/pytest-dev/pytest-timeout/#changelog";
license = licenses.mit;
maintainers = with maintainers; [ makefu costrouc ];
};