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

Commits on Mar 18, 2019

  1. bonfire: use pytest_3 

    Otherwise, tests fail with
> Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead.

(cherry picked from commit 8f115c0)
    Robert Schütz committed Mar 18, 2019
    Copy the full SHA
    d6d0931 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/tools/misc/bonfire/default.nix
2 changes: 1 addition & 1 deletion pkgs/tools/misc/bonfire/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ buildPythonApplication rec {
--replace "data_files = *.rst, *.txt" ""
'';

buildInputs = [ httpretty pytest pytestcov ];
buildInputs = [ httpretty pytest_3 pytestcov ];

propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ];