pytest-timeout incompatible with pytest4

Ohjeah · Ohjeah · commit b4d770e37e9b · 2019-01-11T11:41:02.000+01:00
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ init:
 
 test:
 	pytest glyph --doctest-modules
-	pytest tests --cov=glyph --cov-config setup.cfg
+	pytest tests/unittest --cov=glyph --cov-config setup.cfg
 
 integration:
 	pytest tests/integration_test --runslow -n8 --cov=glyph --cov-config setup.cfg
