From 917400bcffd3a4179c4789a91857a5f1420081dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 12 Nov 2018 18:55:50 +0100 Subject: [PATCH] Revert "Python: reduce amount of warnings when building with `buildPython*`" Turns out that many packages' testsuites rely on the default warnings setup. This reverts commit c1e003ff2f8a43189d48b7194ec8556aa3d88641. --- pkgs/development/interpreters/python/mk-python-derivation.nix | 4 ---- pkgs/development/python-modules/pytest/default.nix | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index ef8ee4e5425b..63ffdbb8c0ac 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -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; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index ad8c8d9ad0da..9412a750a9ab 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -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 '';