Merge pull request #84954 from unode/master

mnemosyne: Fix Qt related segfault and OpenGL warning
This commit is contained in:
Michele Guerini Rocco
2020-04-13 12:56:14 +02:00
committed by GitHub
2 changed files with 16 additions and 10 deletions

View File

@@ -44,7 +44,11 @@ buildPythonPackage rec {
# Disable doctest plugin because times out
checkPhase = ''
substituteInPlace pytest.ini --replace "--doctest-modules" ""
pytest --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"}
pytest \
--deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \
--deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \
${stdenv.lib.optionalString stdenv.isDarwin
"--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"}
'';
meta = with stdenv.lib; {