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

Commits on Feb 20, 2020

  1. pythonPackages.can: remove pytest-timeout check input 

    pytest-timeout can cause tests to be flaky. It's not
necessary to patch the code, as pytest ignores unrecognized
marks with an ignorable warning.
    @KamilaBorowska
    KamilaBorowska authored and Jon committed Feb 20, 2020
    Copy the full SHA
    8dd592e View commit details
Showing with 1 addition and 6 deletions.
  1. +1 −6 pkgs/development/python-modules/can/default.nix
7 changes: 1 addition & 6 deletions pkgs/development/python-modules/can/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,12 +24,7 @@ buildPythonPackage rec {
};

propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];

# Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in
# that case. This clause can be removed once hypothesis has been upgraded in
# nixpkgs.
doCheck = !(isPy27 && (hypothesis.version == "4.7.3"));
checkInputs = [ nose mock pytest hypothesis future ];

# Add the scripts to PATH
checkPhase = ''