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

Commits on Oct 25, 2019

  1. python3.pkgs.python-dbusmock: fix build 

    The test_code codestyle test failed because of the lines being too long.
We added --ignore=E501 to fix this, which makes it ignore checking
line length.
    @worldofpeace
    worldofpeace committed Oct 25, 2019
    Copy the full SHA
    b9f2c7d View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 pkgs/development/python-modules/python-dbusmock/default.nix
7 changes: 5 additions & 2 deletions pkgs/development/python-modules/python-dbusmock/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi,
{ lib, buildPythonPackage, fetchPypi, runtimeShell,
nose, dbus, dbus-python, pygobject3,
which, pyflakes, pycodestyle, bluez, networkmanager
}:
@@ -13,7 +13,10 @@ buildPythonPackage rec {
};

prePatch = ''
sed -i -e 's|pyflakes3|pyflakes|g' tests/test_code.py;
substituteInPlace tests/test_code.py \
--replace "pyflakes3" "pyflakes" \
--replace "/bin/bash" "${runtimeShell}" \
--replace "--ignore=E124,E402,E731,W504" "--ignore=E124,E402,E731,W504,E501" # ignore long lines too
'';

# TODO: Get the rest of these tests running?