summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2021-05-08 16:57:02 +0200
committeraszlig <aszlig@nix.build>2021-05-09 02:26:37 +0200
commitc362a28fcf2621fd3b6d6a96c821e9af9d123e21 (patch)
treee0fcc549df27bf4c9f900f7a00c5d5494ca1f50f /nixos/lib
parent78c97f07c8b912373b2cb957e6478b0d80ca3bf6 (diff)
downloadnixpkgs-c362a28fcf2621fd3b6d6a96c821e9af9d123e21.tar
nixpkgs-c362a28fcf2621fd3b6d6a96c821e9af9d123e21.tar.gz
nixpkgs-c362a28fcf2621fd3b6d6a96c821e9af9d123e21.tar.bz2
nixpkgs-c362a28fcf2621fd3b6d6a96c821e9af9d123e21.tar.lz
nixpkgs-c362a28fcf2621fd3b6d6a96c821e9af9d123e21.tar.xz
nixpkgs-c362a28fcf2621fd3b6d6a96c821e9af9d123e21.tar.zst
nixpkgs-c362a28fcf2621fd3b6d6a96c821e9af9d123e21.zip
nixos/testing: Switch from black to pyflakes
So far, we have used "black" for formatting the test code, which is
rather strict and opinionated and when used inline in Nix expressions it
creates all sorts of trouble.

One of the main annoyances is that when using strings coming from Nix
expressions (eg. store paths or option definitions from NixOS modules),
completely unrelated changes could cause tests to fail, since eg. black
wants lines to be broken.

Another downside of enforcing a certain kind of formatting is that it
makes the Nix expression code inconsistent because we're mixing two
spaces of indentation (common in nixpkgs) with four spaces of
indentation as defined in PEP-8. While this is perfectly fine for
standalone Python files, it really looks ugly and inconsistent IMO when
used within Nix strings.

What we actually want though is a linter that catches problems early on
before actually running the test, because this is *actually* helping in
development because running the actual VM test takes much longer.

This is the reason why I switched from black to pyflakes, because the
latter actually has useful checks, eg. usage of undefined variables,
invalid format arguments, duplicate arguments, shadowed loop vars and
more.

Signed-off-by: aszlig <aszlig@nix.build>
Closes: https://github.com/NixOS/nixpkgs/issues/72964
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/testing-python.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 6497b897eaf..6327f7a10a3 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -159,7 +159,7 @@ rec {
 
             echo -n "$testScript" > $out/test-script
             ${lib.optionalString (!skipLint) ''
-              ${python3Packages.black}/bin/black --check --diff $out/test-script
+              ${python3Packages.pyflakes}/bin/pyflakes $out/test-script
             ''}
 
             ln -s ${testDriver}/bin/nixos-test-driver $out/bin/