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

Commits on Nov 12, 2018

  1. Revert "Python: reduce amount of warnings when building with `buildPy… 

    …thon*`"

Turns out that many packages' testsuites rely on the default warnings setup.

This reverts commit c1e003f.
    @FRidh
    FRidh committed Nov 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    917400b View commit details
Showing with 1 addition and 6 deletions.
  1. +0 −4 pkgs/development/interpreters/python/mk-python-derivation.nix
  2. +1 −2 pkgs/development/python-modules/pytest/default.nix
4 changes: 0 additions & 4 deletions pkgs/development/interpreters/python/mk-python-derivation.nix
View file
Original file line number Diff line number Diff line change
@@ -101,10 +101,6 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
${python.interpreter} ${./catch_conflicts}/catch_conflicts.py
'' + attrs.postFixup or '''';

# Print fewer warnings so we have less noise in our logs
# The amount of warnings also caused builds to be terminated.
PYTHONWARNINGS="once";

meta = {
# default to python's platforms
platforms = python.meta.platforms;
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/pytest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,8 +24,7 @@ buildPythonPackage rec {

checkPhase = ''
runHook preCheck
# Re-enable warnings because the test suite relies on it.
PYTHONWARNINGS= $out/bin/py.test -x testing/
$out/bin/py.test -x testing/
runHook postCheck
'';