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: fd7ac7e607b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 806ddfb69650
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 10, 2020

  1. python3Packages.nose2: 0.9.1 -> 0.9.2 and fix build for ZHF 

    See inline comment; this is currently broken and not going to continue working
on python2 without significant effort, so mark it python >= 3.6 only.

https://hydra.nixos.org/build/114680648
https://hydra.nixos.org/build/115518949

CC @NixOS/nixos-release-managers

ZHF: #80379
(cherry picked from commit f9bc195)
    @bhipple
    bhipple committed Apr 10, 2020
    Copy the full SHA
    bb5bd4e View commit details

Commits on Apr 11, 2020

  1. Merge pull request #84950 from bhipple/bp/nose 

    [20.03] python3Packages.nose2: 0.9.1 -> 0.9.2 and fix build for ZHF
    @worldofpeace
    worldofpeace authored Apr 11, 2020
    Copy the full SHA
    806ddfb View commit details
Showing with 7 additions and 6 deletions.
  1. +7 −6 pkgs/development/python-modules/nose2/default.nix
13 changes: 7 additions & 6 deletions pkgs/development/python-modules/nose2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,28 +3,29 @@
, fetchPypi
, six
, pythonOlder
, mock
, coverage
}:

buildPythonPackage rec {
pname = "nose2";
version = "0.9.1";
version = "0.9.2";

# Requires mock 2.0.0 if python < 3.6, but NixPkgs has mock 3.0.5.
disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
sha256 = "16drs4bc2wvgwwi1pf6pmk6c00pl16vs1v7djc4a8kwpsxpibphf";
sha256 = "0pmbb6nk31yhgh4zkcblzxsznml7f7pf5q1ihgrwvbxv4mwzfql7";
};

propagatedBuildInputs = [ six coverage ]
++ stdenv.lib.optionals (pythonOlder "3.4") [ mock ];
propagatedBuildInputs = [ six coverage ];

# AttributeError: 'module' object has no attribute 'collector'
doCheck = false;

meta = with stdenv.lib; {
description = "nose2 is the next generation of nicer testing for Python";
homepage = https://github.com/nose-devs/nose2;
homepage = "https://github.com/nose-devs/nose2";
license = licenses.bsd0;
};