treewide: run nixfmt 1.0.0
This commit is contained in:
@@ -23,13 +23,14 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ zipp ]
|
||||
++ lib.optionals (!isPy3k) [
|
||||
pathlib2
|
||||
contextlib2
|
||||
configparser
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
zipp
|
||||
]
|
||||
++ lib.optionals (!isPy3k) [
|
||||
pathlib2
|
||||
contextlib2
|
||||
configparser
|
||||
];
|
||||
|
||||
# Cyclic dependencies
|
||||
doCheck = false;
|
||||
|
||||
@@ -23,7 +23,8 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
pbr
|
||||
] ++ lib.optionals isPy27 [ funcsigs ];
|
||||
]
|
||||
++ lib.optionals isPy27 [ funcsigs ];
|
||||
|
||||
# On PyPy for Python 2.7 in particular, Mock's tests have a known failure.
|
||||
# Mock upstream has a decoration to disable the failing test and make
|
||||
|
||||
@@ -63,21 +63,20 @@ buildPythonPackage rec {
|
||||
|
||||
installPhase = "installPhase";
|
||||
|
||||
checkPhase =
|
||||
''
|
||||
sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
|
||||
tests/common.py
|
||||
sed -i -e "s/, glade$//" \
|
||||
-e "s/.*testGlade.*//" \
|
||||
-e "s/.*(glade.*//" \
|
||||
tests/test_api.py
|
||||
''
|
||||
+ ''
|
||||
sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \
|
||||
-e "s/sys.path.insert(0, buildDir)//" \
|
||||
tests/common.py
|
||||
make check
|
||||
'';
|
||||
checkPhase = ''
|
||||
sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
|
||||
tests/common.py
|
||||
sed -i -e "s/, glade$//" \
|
||||
-e "s/.*testGlade.*//" \
|
||||
-e "s/.*(glade.*//" \
|
||||
tests/test_api.py
|
||||
''
|
||||
+ ''
|
||||
sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \
|
||||
-e "s/sys.path.insert(0, buildDir)//" \
|
||||
tests/common.py
|
||||
make check
|
||||
'';
|
||||
# XXX: TypeError: Unsupported type: <class 'gtk._gtk.WindowType'>
|
||||
# The check phase was not executed in the previous
|
||||
# non-buildPythonPackage setup - not sure why not.
|
||||
|
||||
@@ -41,20 +41,19 @@ buildPythonPackage rec {
|
||||
mock
|
||||
];
|
||||
buildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs =
|
||||
[
|
||||
attrs
|
||||
py
|
||||
setuptools
|
||||
six
|
||||
pluggy
|
||||
more-itertools
|
||||
atomicwrites
|
||||
wcwidth
|
||||
packaging
|
||||
]
|
||||
++ lib.optionals (!isPy3k) [ funcsigs ]
|
||||
++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
py
|
||||
setuptools
|
||||
six
|
||||
pluggy
|
||||
more-itertools
|
||||
atomicwrites
|
||||
wcwidth
|
||||
packaging
|
||||
]
|
||||
++ lib.optionals (!isPy3k) [ funcsigs ]
|
||||
++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
|
||||
|
||||
doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
|
||||
checkPhase = ''
|
||||
|
||||
Reference in New Issue
Block a user